j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'tincstart' of https://github.com/dechamps/tinc into 1.1

Browse source
This commit is contained in:
Guus Sliepen 2014-07-12 22:22:31 +02:00
commit f704304823
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/tincctl.c
View file

@ -810,16 +810,31 @@ static int cmd_start(int argc, char *argv[]) {
int nargc = 0; int nargc = 0;
char **nargv = xzalloc((optind + argc) * sizeof *nargv); char **nargv = xzalloc((optind + argc) * sizeof *nargv);
nargv[nargc++] = c; char *arg0 = c;
#ifdef HAVE_MINGW
/*
Windows has no real concept of an "argv array". A command line is just one string.
The CRT of the new process will decode the command line string to generate argv before calling main(), and (by convention)
it uses quotes to handle spaces in arguments.
Therefore we need to quote all arguments that might contain spaces. No, execvp() won't do that for us (see MSDN).
If we don't do that, then execvp() will run fine but any spaces in the filename contained in arg0 will bleed
into the next arguments when the spawned process' CRT parses its command line, resulting in chaos.
*/
xasprintf(&arg0, "\"%s\"", arg0);
#endif
nargv[nargc++] = arg0;
for(int i = 1; i < optind; i++) for(int i = 1; i < optind; i++)
nargv[nargc++] = orig_argv[i]; nargv[nargc++] = orig_argv[i];
for(int i = 1; i < argc; i++) for(int i = 1; i < argc; i++)
nargv[nargc++] = argv[i]; nargv[nargc++] = argv[i];
#ifdef HAVE_MINGW #ifdef HAVE_MINGW
execvp(c, nargv); int status = spawnvp(_P_WAIT, c, nargv);
fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno)); if (status == -1) {
return 1; fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
return 1;
}
return status;
#else #else
pid_t pid = fork(); pid_t pid = fork();
if(pid == -1) { if(pid == -1) {