aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-07-22 18:48:38 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-07-22 18:48:38 +0200
commit0fb0045aa9261be1dda49dfdfb95cbc585402a8b (patch)
tree951e3f34078b2a2e5702672472dc7ba3b1e51926 /libbb
parent49117b48008e0fe36d6680c787045cb44a300f93 (diff)
downloadbusybox-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.tar.gz
config: disentangle PREFER_APPLETS from SH_STANDALONE and SH_NOFORK
On user request. I thought enabling/disabling them all together is more consistent. Evidently, some people do want them to be separately selectable. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/vfork_daemon_rexec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 1adb5b3c4..c192829b5 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -68,7 +68,8 @@ pid_t FAST_FUNC xspawn(char **argv)
return pid;
}
-#if ENABLE_FEATURE_PREFER_APPLETS
+#if ENABLE_FEATURE_PREFER_APPLETS \
+ || ENABLE_FEATURE_SH_NOFORK
static jmp_buf die_jmp;
static void jump(void)
{
@@ -174,7 +175,7 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
}
-#endif /* FEATURE_PREFER_APPLETS */
+#endif /* FEATURE_PREFER_APPLETS || FEATURE_SH_NOFORK */
int FAST_FUNC spawn_and_wait(char **argv)
{