diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-15 00:41:04 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-01-15 00:41:04 +0100 |
| commit | 1750d3afc142f467b78ca3557dcf735b5988cf74 (patch) | |
| tree | f0fbb7eb270a3838d183602c343602c59af92c35 | |
| parent | cefdd4be1ff58923117a3b3f5168558875052a48 (diff) | |
| download | busybox-1750d3afc142f467b78ca3557dcf735b5988cf74.tar.gz | |
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>
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 3 insertions, 1 deletions
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()? |