23ccb80fcb
patch by Jens Gustedt. previously, the intended policy was to use __environ in code that must conform to the ISO C namespace requirements, and environ elsewhere. this policy was not followed in practice anyway, making things confusing. on top of that, Jens reported that certain combinations of link-time optimization options were breaking with the inconsistent references; this seems to be a compiler or linker bug, but having it go away is a nice side effect of the changes made here.
49 lines
949 B
C
49 lines
949 B
C
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
|
|
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;
|
|
|
|
errno = ENOENT;
|
|
if (!*file) return -1;
|
|
|
|
if (strchr(file, '/'))
|
|
return execve(file, argv, envp);
|
|
|
|
if (!path) path = "/usr/local/bin:/bin:/usr/bin";
|
|
k = strnlen(file, NAME_MAX+1);
|
|
if (k > NAME_MAX) {
|
|
errno = ENAMETOOLONG;
|
|
return -1;
|
|
}
|
|
l = strnlen(path, PATH_MAX-1)+1;
|
|
|
|
for(p=path; ; p=z) {
|
|
char b[l+k+1];
|
|
z = strchr(p, ':');
|
|
if (!z) z = p+strlen(p);
|
|
if (z-p >= l) {
|
|
if (!*z++) break;
|
|
continue;
|
|
}
|
|
memcpy(b, p, z-p);
|
|
b[z-p] = '/';
|
|
memcpy(b+(z-p)+(z>p), file, k+1);
|
|
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);
|
|
}
|