From: Denys Vlasenko Date: Thu, 1 Nov 2018 11:50:33 +0000 (+0100) Subject: ash: fix thinko in last commit X-Git-Tag: 1_30_0~416 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b0df5af0fad7969a10d3910465bfd0ff518b1358;p=oweals%2Fbusybox.git ash: fix thinko in last commit Signed-off-by: Denys Vlasenko --- diff --git a/shell/ash.c b/shell/ash.c index 19004aad8..88f2b5bd6 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -8018,8 +8018,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c #if ENABLE_FEATURE_SH_STANDALONE if (applet_no >= 0) { # if NUM_SCRIPTS > 0 - if (applet_no >= NUM_APPLETS) - goto run_script; + if (applet_no < NUM_APPLETS) # endif if (APPLET_IS_NOEXEC(applet_no)) { clearenv(); @@ -8045,9 +8044,6 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c #endif if (cmd != bb_busybox_exec_path && errno == ENOEXEC) { -#if ENABLE_FEATURE_SH_STANDALONE && NUM_SCRIPTS > 0 - run_script: -#endif /* Run "cmd" as a shell script: * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html * "If the execve() function fails with ENOEXEC, the shell