Backport fix for execvp issue from trunk

diff --git a/src/ChangeLog b/src/ChangeLog
index d09ad50ba1214685f2cd86b0e5de4c093b617513..9cfcd1139ee6a93e45690b1ddb30bc9c82670924 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-03  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that
+       daemon mode works on cygw32 when Emacs is installed and not just
+       during development.
+
 2013-02-01  Eli Zaretskii  <eliz@gnu.org>
 
        * callproc.c (Fcall_process): Make sure program name in PATH and

diff --git a/src/emacs.c b/src/emacs.c
index c0c230ef3dd2ff402603c762c668e62d0ebcdaae..71d84efcbfc6f3e6407184bfe6d2a4295969822e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1036,7 +1036,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
             argv[skip_args] = fdStr;
 
-            execv (argv[0], argv);
+            execvp (argv[0], argv);
             fprintf (stderr, "emacs daemon: exec failed: %d\n", errno);
             exit (1);
           }