summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-01-14 23:41:04 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2018-01-14 23:41:04 (GMT)
commit1750d3afc142f467b78ca3557dcf735b5988cf74 (patch)
treef0fbb7eb270a3838d183602c343602c59af92c35
parentcefdd4be1ff58923117a3b3f5168558875052a48 (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
ash: a bit of NOFORK code should only be active if FEATURE_SH_STANDALONE=yHEADmaster
function old new delta evalcommand 1546 1420 -126 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 8c0f3bd..8211c76 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()?