ash: a bit of NOFORK code should only be active if FEATURE_SH_STANDALONE=y
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 14 Jan 2018 23:41:04 +0000 (00:41 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 14 Jan 2018 23:41:04 +0000 (00:41 +0100)
function                                             old     new   delta
evalcommand                                         1546    1420    -126

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
shell/ash.c

index 8c0f3bd8de810bc9e895c648825d7b2a66dc4f23..8211c766fa08ede50e5a8592aee9016df139a957 100644 (file)
@@ -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()?