summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2009-11-27 13:05:14 +0000
committered <ed@FreeBSD.org>2009-11-27 13:05:14 +0000
commit6909f7535ebfa64618eff12fc2bb071dde06a52b (patch)
tree2c11ccaa7231e474ab629db20bd0800fdb88d2c7 /lib
parent0f796b1cf44c3037f579295ad941e4fe3350f433 (diff)
downloadFreeBSD-src-6909f7535ebfa64618eff12fc2bb071dde06a52b.zip
FreeBSD-src-6909f7535ebfa64618eff12fc2bb071dde06a52b.tar.gz
Properly use the envp argument in execvPe().
execvPe() is called by _execvpe(), which we added to implement posix_spawnp(). We just took execvP() and added the envp argument. Unfortunately we forgot to change the implementation to use envp over environ. This fixes the following piece of code: | char * const arg[2] = { "env", NULL }; | char * const env[2] = { "FOO=BAR", NULL }; | posix_spawnp(NULL, "/usr/bin/env", NULL, NULL, arg, env); MFC after: 2 weeks
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 985a09a..7ffce90 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -209,7 +209,7 @@ execvPe(name, path, argv, envp)
bcopy(name, buf + lp + 1, ln);
buf[lp + ln + 1] = '\0';
-retry: (void)_execve(bp, argv, environ);
+retry: (void)_execve(bp, argv, envp);
switch (errno) {
case E2BIG:
goto done;
@@ -228,7 +228,7 @@ retry: (void)_execve(bp, argv, environ);
memp[0] = "sh";
memp[1] = bp;
bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
- (void)_execve(_PATH_BSHELL, memp, environ);
+ (void)_execve(_PATH_BSHELL, memp, envp);
goto done;
case ENOMEM:
goto done;
OpenPOWER on IntegriCloud