ardour/livetrax
13
0
Fork 0
Code

some half-baked support for windows command-arg substitutions

Browse Source
This commit is contained in:
Robin Gareus 2016-02-13 17:04:11 +01:00
parent fc5c247aa1
commit 73245c6217
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/pbd/system_exec.cc
View File

@ -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<char, std::string> 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<char, std::string> s
// Glib::find_program_in_path () is only available in Glib >= 2.28
// cmd = Glib::find_program_in_path (argp[0]);
#endif
make_envp();
}