# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1222694712 -7200
# Node ID 83d95ecaf5eaa14ffd7f56115e17ba439668ee26
# Parent  a7110dbf49eda51a8a5735a0647637dda545505a
Propagate effects of putenv/setenv/unsetenv to child processes.

diff -r a7110dbf49ed -r 83d95ecaf5ea ChangeLog
--- a/ChangeLog	Mon Sep 29 06:24:03 2008 -0700
+++ b/ChangeLog	Mon Sep 29 15:25:12 2008 +0200
@@ -1,3 +1,9 @@
+2008-09-29  Bruno Haible  <bruno@clisp.org>
+
+	Propagate effects of putenv/setenv/unsetenv to child processes.
+	* lib/execute.c (execute): Use spawnvpe instead of spawnvp.
+	* lib/pipe.c (create_pipe): Likewise.
+
 2008-09-29  Bruno Haible  <bruno@clisp.org>
 
 	Enable use of shell scripts as executables in mingw.
diff -r a7110dbf49ed -r 83d95ecaf5ea lib/execute.c
--- a/lib/execute.c	Mon Sep 29 06:24:03 2008 -0700
+++ b/lib/execute.c	Mon Sep 29 15:25:12 2008 +0200
@@ -161,15 +161,23 @@
 	      && ((null_stdout && nulloutfd == STDOUT_FILENO)
 		  || (null_stderr && nulloutfd == STDERR_FILENO)
 		  || close (nulloutfd) >= 0))))
+    /* Use spawnvpe and pass the environment explicitly.  This is needed if
+       the program has modified the environment using putenv() or [un]setenv().
+       On Windows, programs have two environments, one in the "environment
+       block" of the process and managed through SetEnvironmentVariable(), and
+       one inside the process, in the location retrieved by the 'environ'
+       macro.  When using spawnvp() without 'e', the child process inherits a
+       copy of the environment block - ignoring the effects of putenv() and
+       [un]setenv().  */
     {
-      exitcode = spawnvp (P_WAIT, prog_path, prog_argv);
+      exitcode = spawnvpe (P_WAIT, prog_path, prog_argv, environ);
       if (exitcode < 0 && errno == ENOEXEC)
 	{
 	  /* prog is not an native executable.  Try to execute it as a
 	     shell script.  Note that prepare_spawn() has already prepended
 	     a hidden element "sh.exe" to prog_argv.  */
 	  --prog_argv;
-	  exitcode = spawnvp (P_WAIT, prog_argv[0], prog_argv);
+	  exitcode = spawnvpe (P_WAIT, prog_argv[0], prog_argv, environ);
 	}
     }
   if (nulloutfd >= 0)
diff -r a7110dbf49ed -r 83d95ecaf5ea lib/pipe.c
--- a/lib/pipe.c	Mon Sep 29 06:24:03 2008 -0700
+++ b/lib/pipe.c	Mon Sep 29 15:25:12 2008 +0200
@@ -202,15 +202,23 @@
        we want in the case of STD*_FILENO) and also orig_stdin,
        orig_stdout, orig_stderr (which is not explicitly wanted but
        harmless).  */
+    /* Use spawnvpe and pass the environment explicitly.  This is needed if
+       the program has modified the environment using putenv() or [un]setenv().
+       On Windows, programs have two environments, one in the "environment
+       block" of the process and managed through SetEnvironmentVariable(), and
+       one inside the process, in the location retrieved by the 'environ'
+       macro.  When using spawnvp() without 'e', the child process inherits a
+       copy of the environment block - ignoring the effects of putenv() and
+       [un]setenv().  */
     {
-      child = spawnvp (P_NOWAIT, prog_path, prog_argv);
+      child = spawnvpe (P_NOWAIT, prog_path, prog_argv, environ);
       if (child < 0 && errno == ENOEXEC)
 	{
 	  /* prog is not an native executable.  Try to execute it as a
 	     shell script.  Note that prepare_spawn() has already prepended
 	     a hidden element "sh.exe" to prog_argv.  */
 	  --prog_argv;
-	  child = spawnvp (P_NOWAIT, prog_argv[0], prog_argv);
+	  child = spawnvpe (P_NOWAIT, prog_argv[0], prog_argv, environ);
 	}
     }
   if (stdinfd >= 0)