(w32_execvp): New function; wrapper for `execvp'.

(execvp) [WINDOWSNT]: Redefine to `w32_execvp'.
(fail): Remove Windows-specific fix (subsumed in w32_execvp).

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 97266d8a66e562148d94cf25c240a1bc81730064..f15644050d9ba67fd42c1806b00c11c72d312bfb 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-15  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacsclient.c (w32_execvp): New function; wrapper for `execvp'.
+       (execvp) [WINDOWSNT]: Redefine to `w32_execvp'.
+       (fail): Remove Windows-specific fix (subsumed into w32_execvp).
+       Suggestions and comment by Eli Zaretskii.
+
 2006-12-06  Christoph Conrad  <christoph.conrad@gmx.de>
 
        * makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe):
@@ -19,11 +26,11 @@
        (set_tcp_socket): Make the message for non-local connections
        informational rather than an error.
 
-2006-11-28  Kevin Ryde <user42@zip.com.au>  (tiny change)
+2006-11-28  Kevin Ryde  <user42@zip.com.au>  (tiny change)
 
        * etags.c (readline): Check for double quote after #line.
 
-2006-11-28  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>  (tiny change)
+2006-11-28  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * etags.c (readline): sscanf could in principle return 2.
 
@@ -55,8 +62,8 @@
 
 2006-11-24  Michael Mauger  <mmaug@yahoo.com>
 
-       * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support
-       absolute file names with forward slashes.
+       * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support absolute
+       file names with forward slashes.
 
 2006-11-23  Juanma Barranquero  <lekktu@gmail.com>
 

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index f05b98eccee89da74aa649405d57d37aef98cd6e..429d4b5bdc488ab43e2b926e6b4b818415afc506 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -298,6 +298,42 @@ Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
 }
 
 \f
+#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 @@ fail (argc, argv)
   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);