[git commit] ash: a bit of NOFORK code should only be active if FEATURE_SH_STANDALONE=y

Denys Vlasenko vda.linux at googlemail.com
Sun Jan 14 23:41:04 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=1750d3afc142f467b78ca3557dcf735b5988cf74
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
evalcommand                                         1546    1420    -126

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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()?


More information about the busybox-cvs mailing list