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
}
init ();
make_argp_escaped(command, subs);
+#ifdef PLATFORM_WINDOWS
+ if (argp[0] && strlen (argp[0]) > 0) {
+ std::string wa = argp[0];
+ // only add quotes to command if required..
+ if (argp[0][0] != '"'
+ && argp[0][strlen(argp[0])-1] != '"'
+ && strchr(argp[0], ' ')) {
+ wa = "\"";
+ wa += argp[0];
+ wa += "\"";
+ }
+ // ...but always quote all args
+ for (int i = 1; argp[i]; ++i) {
+ std::string tmp (argp[i]);
+ while (tmp.find("\"") != std::string::npos)
+ tmp.replace(tmp.find("\""), 1, "\\\"");
+ wa += " \"";
+ wa += tmp;
+ wa += '"';
+ }
+ 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]);
// Glib::find_program_in_path () is only available in Glib >= 2.28
// cmd = Glib::find_program_in_path (argp[0]);
-
+#endif
make_envp();
}
return 0;
}
+string
+SystemExec::to_s () const
+{
+#ifdef PLATFORM_WINDOWS
+ return string (w_args ? w_args : "");
+#else
+ stringstream out;
+ if (argp) {
+ for (int i = 0; argp[i]; ++i) {
+ out << argp[i] << " ";
+ }
+ }
+ return out.str();
+#endif
+}
+
#ifdef PLATFORM_WINDOWS /* Windows Process */
/* HELPER FUNCTIONS */
ReadStdout(data, bytesRead);/* EMIT SIGNAL */
}
Terminated();/* EMIT SIGNAL */
+ pthread_exit(0);
}
void
/* if pid is non-zero, the child task is still executing (i.e. it did
* not exit in response to stdin being closed). try to kill it.
*/
-
+
if (pid) {
::kill(pid, SIGTERM);
::usleep(250000);
ReadStdout(rv, r);/* EMIT SIGNAL */
}
Terminated();/* EMIT SIGNAL */
+ pthread_exit(0);
}
void