From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 21 Feb 2018 16:59:34 +0000 (-0500)
Subject: convert execvp error handling to switch statement
X-Git-Tag: v1.1.19~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d6102427d8d5450bd28788c792f97ef90cce274;p=oweals%2Fmusl.git

convert execvp error handling to switch statement

this is more extensible if we need to consider additional errors, and
more efficient as long as the compiler does not know it can cache the
result of __errno_location (a surprisingly complex issue detailed in
commit a603a75a72bb469c6be4963ed1b55fabe675fe15).
---

diff --git a/src/process/execvp.c b/src/process/execvp.c
index 480a85e9..2dddeddb 100644
--- a/src/process/execvp.c
+++ b/src/process/execvp.c
@@ -39,8 +39,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 && errno != ENOTDIR) 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;