diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2009-11-27 13:05:14 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2009-11-27 13:05:14 +0000 |
| commit | f67d07f0e1236d9cbc2a28508b3da08f41ca7178 (patch) | |
| tree | 2c11ccaa7231e474ab629db20bd0800fdb88d2c7 /lib | |
| parent | 1439785421f62d874d5758d474d932c7c6f4e37e (diff) | |
| download | src-f67d07f0e1236d9cbc2a28508b3da08f41ca7178.tar.gz src-f67d07f0e1236d9cbc2a28508b3da08f41ca7178.zip | |
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
Notes
Notes:
svn path=/head/; revision=199862
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c index 985a09a4fcf7..7ffce90d32fc 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; |