X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fprocess%2Fexecvp.c;h=0a33e42db9a66fb52ef04cd05230dc5b83fe7d11;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hp=b2da44b92cc134918d510e7d7b06504014c1c902;hpb=4b87736998e8d8c0610c3c31b6862c77248a98df;p=musl diff --git a/src/process/execvp.c b/src/process/execvp.c index b2da44b9..0a33e42d 100644 --- a/src/process/execvp.c +++ b/src/process/execvp.c @@ -4,7 +4,9 @@ #include #include -int execvp(const char *file, char *const argv[]) +extern char **__environ; + +int __execvpe(const char *file, char *const argv[], char *const envp[]) { const char *p, *z, *path = getenv("PATH"); size_t l, k; @@ -13,7 +15,7 @@ int execvp(const char *file, char *const argv[]) if (!*file) return -1; if (strchr(file, '/')) - return execv(file, argv); + return execve(file, argv, envp); if (!path) path = "/usr/local/bin:/bin:/usr/bin"; k = strnlen(file, NAME_MAX+1); @@ -34,9 +36,14 @@ int execvp(const char *file, char *const argv[]) memcpy(b, p, z-p); b[z-p] = '/'; memcpy(b+(z-p)+(z>p), file, k+1); - execv(b, argv); + execve(b, argv, envp); if (errno != ENOENT) return -1; if (!*z++) break; } return -1; } + +int execvp(const char *file, char *const argv[]) +{ + return __execvpe(file, argv, __environ); +}