From 73245c621706dfa71f279506155a5b2707195d9b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 13 Feb 2016 17:04:11 +0100 Subject: [PATCH] some half-baked support for windows command-arg substitutions --- libs/pbd/system_exec.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc index a19e873da2..fe74bbf133 100644 --- a/libs/pbd/system_exec.cc +++ b/libs/pbd/system_exec.cc @@ -170,6 +170,7 @@ SystemExec::init () stdinP[0] = stdinP[1] = INVALID_HANDLE_VALUE; stdoutP[0] = stdoutP[1] = INVALID_HANDLE_VALUE; stderrP[0] = stderrP[1] = INVALID_HANDLE_VALUE; + w_args = NULL; #endif } @@ -199,6 +200,14 @@ SystemExec::SystemExec (std::string command, const std::map s init (); make_argp_escaped(command, subs); +#ifdef PLATFORM_WINDOWS + std::string wa; + for (int i = 0; argp[i]; ++i) { + if (!wa.empty ()) wa += " "; + wa += '"' + argp[i] + '"'; + } + w_args = strdup(wa.c_str()); +#else if (find_file (Searchpath (Glib::getenv ("PATH")), argp[0], cmd)) { // argp[0] exists in $PATH` - set it to the actual path where it was found free (argp[0]); @@ -208,7 +217,7 @@ SystemExec::SystemExec (std::string command, const std::map s // Glib::find_program_in_path () is only available in Glib >= 2.28 // cmd = Glib::find_program_in_path (argp[0]); - +#endif make_envp(); }