3 files changed, 39 insertions, 22 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4c3195973c..302010ec769 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * callproc.c (Fcall_process): Make sure program name in PATH and
+        new_argv[0] is encoded, if needed.  Otherwise, un-encoded string
+        is passed to exec/spawnve, which fails unless the file-name
+        encoding is UTF-8.
+
+        * w32proc.c (sys_spawnve): Make sure escape_char is initialized,
+        even if w32-quote-process-args is nil.
+
 2013-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix timestamp bug when write-region appends nothing (Bug#13149).
diff --git a/src/callproc.c b/src/callproc.c
index 5eba3271358..9d81bb18295 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -445,28 +445,34 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     path = Fsubstring (path, make_number (2), Qnil);
 
   new_argv = SAFE_ALLOCA ((nargs > 4 ? nargs - 2 : 2) * sizeof *new_argv);
-  if (nargs > 4)
-    {
-      ptrdiff_t i;
-      struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 
-      GCPRO5 (infile, buffer, current_dir, path, error_file);
-      argument_coding.dst_multibyte = 0;
-      for (i = 4; i < nargs; i++)
-        {
-          argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]);
-          if (CODING_REQUIRE_ENCODING (&argument_coding))
-            /* We must encode this argument.  */
-            args[i] = encode_coding_string (&argument_coding, args[i], 1);
-        }
-      UNGCPRO;
-      for (i = 4; i < nargs; i++)
-        new_argv[i - 3] = SSDATA (args[i]);
-      new_argv[i - 3] = 0;
-    }
-  else
-    new_argv[1] = 0;
-  new_argv[0] = SSDATA (path);
+  {
+    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
+
+    GCPRO5 (infile, buffer, current_dir, path, error_file);
+    if (nargs > 4)
+      {
+        ptrdiff_t i;
+
+        argument_coding.dst_multibyte = 0;
+        for (i = 4; i < nargs; i++)
+          {
+            argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]);
+            if (CODING_REQUIRE_ENCODING (&argument_coding))
+              /* We must encode this argument.  */
+              args[i] = encode_coding_string (&argument_coding, args[i], 1);
+          }
+        for (i = 4; i < nargs; i++)
+          new_argv[i - 3] = SSDATA (args[i]);
+        new_argv[i - 3] = 0;
+      }
+    else
+      new_argv[1] = 0;
+    if (STRING_MULTIBYTE (path))
+      path = ENCODE_FILE (path);
+    new_argv[0] = SSDATA (path);
+    UNGCPRO;
+  }
 
 #ifdef MSDOS /* MW, July 1993 */
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 0fcb2993020..615e5329e8c 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1541,7 +1541,6 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
   child_process *cp;
   int is_dos_app, is_cygnus_app, is_gui_app;
   int do_quoting = 0;
-  char escape_char;
   /* We pass our process ID to our children by setting up an environment
      variable in their environment.  */
   char ppid_env_var_buffer[64];
@@ -1554,6 +1553,8 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
      Some extra whitespace characters need quoting in Cygwin programs,
      so this list is conditionally modified below.  */
   char *sepchars = " \t*?";
+  /* This is for native w32 apps; modified below for Cygwin apps.  */
+  char escape_char = '\\';
 
   /* We don't care about the other modes */
   if (mode != _P_NOWAIT)