projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try fixing/optimizing x86_64 fenv exception code
[musl]
/
src
/
process
/
execvp.c
diff --git
a/src/process/execvp.c
b/src/process/execvp.c
index
d799dda
..
b2da44b
100644
(file)
--- a/
src/process/execvp.c
+++ b/
src/process/execvp.c
@@
-2,33
+2,41
@@
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
-
-extern char **__environ;
+#include <limits.h>
int execvp(const char *file, char *const argv[])
{
const char *p, *z, *path = getenv("PATH");
int execvp(const char *file, char *const argv[])
{
const char *p, *z, *path = getenv("PATH");
- int l;
+ size_t l, k;
+
+ errno = ENOENT;
+ if (!*file) return -1;
if (strchr(file, '/'))
if (strchr(file, '/'))
- return execv
e(file, argv, __environ
);
+ return execv
(file, argv
);
- /* FIXME: integer overflows */
if (!path) path = "/usr/local/bin:/bin:/usr/bin";
if (!path) path = "/usr/local/bin:/bin:/usr/bin";
- l = strlen(file) + strlen(path) + 2;
+ 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 && *p
; p=z) {
- char b[l];
+ for(p=path; ; p=z) {
+ char b[l
+k+1
];
z = strchr(p, ':');
z = strchr(p, ':');
- if (z) {
- memcpy(b, p, z-p);
- b[z++-p] = 0;
- } else strcpy(b, p);
- strcat(b, "/");
- strcat(b, file);
- if (!access(b, X_OK))
- return execve(b, argv, __environ);
+ 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);
+ execv(b, argv);
+ if (errno != ENOENT) return -1;
+ if (!*z++) break;
}
}
- errno = ENOENT;
return -1;
}
return -1;
}