From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 2 Oct 2016 23:01:15 +0000 (+0200)
Subject: hush: fix exitcode on exec failure with EACCES - should be 126
X-Git-Tag: 1_26_0~172
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=04465dad66478aea28100ff5b9094d1c02336f07;p=oweals%2Fbusybox.git

hush: fix exitcode on exec failure with EACCES - should be 126

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/hush.c b/shell/hush.c
index f1d25a199..d0d983018 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6735,13 +6735,17 @@ static void exec_builtin(char ***to_free,
 static void execvp_or_die(char **argv) NORETURN;
 static void execvp_or_die(char **argv)
 {
+	int e;
 	debug_printf_exec("execing '%s'\n", argv[0]);
 	/* Don't propagate SIG_IGN to the child */
 	if (SPECIAL_JOBSTOP_SIGS != 0)
 		switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS);
 	execvp(argv[0], argv);
+	e = 2;
+	if (errno == EACCES) e = 126;
+	if (errno == ENOENT) e = 127;
 	bb_perror_msg("can't execute '%s'", argv[0]);
-	_exit(127); /* bash compat */
+	_exit(e);
 }
 
 #if ENABLE_HUSH_MODE_X