瀏覽代碼

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).
Rich Felker 7 年之前
父節點
當前提交
6d6102427d
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9 2
      src/process/execvp.c

+ 9 - 2
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;