Mercurial > emacs
changeset 74637:fe8bd1af34c4
(w32_execvp): New function; wrapper for `execvp'.
(execvp) [WINDOWSNT]: Redefine to `w32_execvp'.
(fail): Remove Windows-specific fix (subsumed in w32_execvp).
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 15 Dec 2006 14:50:38 +0000 |
| parents | f886e6f4db4d |
| children | f956be274bf4 |
| files | lib-src/emacsclient.c |
| diffstat | 1 files changed, 37 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/emacsclient.c Fri Dec 15 14:12:44 2006 +0000 +++ b/lib-src/emacsclient.c Fri Dec 15 14:50:38 2006 +0000 @@ -298,6 +298,42 @@ } +#ifdef WINDOWSNT + +/* + execvp() wrapper for Windows. Quotes arguments with embedded spaces. + + This is necessary due to the broken implementation of exec* routines in + the Microsoft libraries: they concatenate the arguments together without + quoting special characters, and pass the result to CreateProcess, with + predictably bad results. By contrast, Posix execvp passes the arguments + directly into the argv[] array of the child process. +*/ +int +w32_execvp (path, argv) + char *path; + char **argv; +{ + int i; + + argv[0] = (char *) alternate_editor; + + for (i = 0; argv[i]; i++) + if (strchr (argv[i], ' ')) + { + char *quoted = alloca (strlen (argv[i]) + 3); + sprintf (quoted, "\"%s\"", argv[i]); + argv[i] = quoted; + } + + return execvp (path, argv); +} + +#undef execvp +#define execvp w32_execvp + +#endif /* WINDOWSNT */ + /* Try to run a different command, or --if no alternate editor is defined-- exit with an errorcode. @@ -310,9 +346,7 @@ if (alternate_editor) { int i = optind - 1; -#ifdef WINDOWSNT - argv[i] = (char *)alternate_editor; -#endif + execvp (alternate_editor, argv + i); message (TRUE, "%s: error executing alternate editor \"%s\"\n", progname, alternate_editor);