From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 14 Jan 2018 23:41:04 +0000 (+0100)
Subject: ash: a bit of NOFORK code should only be active if FEATURE_SH_STANDALONE=y
X-Git-Tag: 1_29_0~360
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1750d3afc142f467b78ca3557dcf735b5988cf74;p=oweals%2Fbusybox.git

ash: a bit of NOFORK code should only be active if FEATURE_SH_STANDALONE=y

function                                             old     new   delta
evalcommand                                         1546    1420    -126

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

diff --git a/shell/ash.c b/shell/ash.c
index 8c0f3bd8d..8211c766f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10011,7 +10011,9 @@ evalcommand(union node *cmd, int flags)
 	switch (cmdentry.cmdtype) {
 	default: {
 
-#if ENABLE_FEATURE_SH_NOFORK && NUM_APPLETS > 1
+#if ENABLE_FEATURE_SH_STANDALONE \
+ && ENABLE_FEATURE_SH_NOFORK \
+ && NUM_APPLETS > 1
 /* (1) BUG: if variables are set, we need to fork, or save/restore them
  *     around run_nofork_applet() call.
  * (2) Should this check also be done in forkshell()?