replace armhf math asm source files with inline asm

[musl] / src / process / execvp.c

diff --git a/src/process/execvp.c b/src/process/execvp.c
index b2da44b..3a8bbe8 100644 (file)
--- a/src/process/execvp.c
+++ b/src/process/execvp.c
@@ -3,17 +3,21 @@
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
+#include "libc.h"
 
-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;
+       int seen_eacces = 0;
 
        errno = ENOENT;
        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 +38,18 @@ 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);
-               if (errno != ENOENT) return -1;
+               execve(b, argv, envp);
+               if (errno == EACCES) seen_eacces = 1;
+               else if (errno != ENOENT) return -1;
                if (!*z++) break;
        }
+       if (seen_eacces) errno = EACCES;
        return -1;
 }
+
+int execvp(const char *file, char *const argv[])
+{
+       return __execvpe(file, argv, __environ);
+}
+
+weak_alias(__execvpe, execvpe);