getaddrinfo: add EAI_NODATA error code to distinguish NODATA vs NxDomain

[musl] / src / process / execvp.c

diff --git a/src/process/execvp.c b/src/process/execvp.c
index 3a8bbe8..ef3b9dd 100644 (file)
--- a/src/process/execvp.c
+++ b/src/process/execvp.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
-#include "libc.h"
 
 extern char **__environ;
 
@@ -29,8 +28,7 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
 
        for(p=path; ; p=z) {
                char b[l+k+1];
-               z = strchr(p, ':');
-               if (!z) z = p+strlen(p);
+               z = __strchrnul(p, ':');
                if (z-p >= l) {
                        if (!*z++) break;
                        continue;
@@ -39,8 +37,15 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
                b[z-p] = '/';
                memcpy(b+(z-p)+(z>p), file, k+1);
                execve(b, argv, envp);
-               if (errno == EACCES) seen_eacces = 1;
-               else if (errno != ENOENT) return -1;
+               switch (errno) {
+               case EACCES:
+                       seen_eacces = 1;
+               case ENOENT:
+               case ENOTDIR:
+                       break;
+               default:
+                       return -1;
+               }
                if (!*z++) break;
        }
        if (seen_eacces) errno = EACCES;