diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-22 18:48:38 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-22 18:48:38 +0200 |
| commit | 0fb0045aa9261be1dda49dfdfb95cbc585402a8b (patch) | |
| tree | 951e3f34078b2a2e5702672472dc7ba3b1e51926 /libbb/vfork_daemon_rexec.c | |
| parent | 49117b48008e0fe36d6680c787045cb44a300f93 (diff) | |
| download | busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.tar.gz busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.tar.bz2 busybox-w32-0fb0045aa9261be1dda49dfdfb95cbc585402a8b.zip | |
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/vfork_daemon_rexec.c')
| -rw-r--r-- | libbb/vfork_daemon_rexec.c | 5 |
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) | |||
| 68 | return pid; | 68 | return pid; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | #if ENABLE_FEATURE_PREFER_APPLETS | 71 | #if ENABLE_FEATURE_PREFER_APPLETS \ |
| 72 | || ENABLE_FEATURE_SH_NOFORK | ||
| 72 | static jmp_buf die_jmp; | 73 | static jmp_buf die_jmp; |
| 73 | static void jump(void) | 74 | static void jump(void) |
| 74 | { | 75 | { |
| @@ -174,7 +175,7 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv) | |||
| 174 | 175 | ||
| 175 | return rc & 0xff; /* don't confuse people with "exitcodes" >255 */ | 176 | return rc & 0xff; /* don't confuse people with "exitcodes" >255 */ |
| 176 | } | 177 | } |
| 177 | #endif /* FEATURE_PREFER_APPLETS */ | 178 | #endif /* FEATURE_PREFER_APPLETS || FEATURE_SH_NOFORK */ |
| 178 | 179 | ||
| 179 | int FAST_FUNC spawn_and_wait(char **argv) | 180 | int FAST_FUNC spawn_and_wait(char **argv) |
| 180 | { | 181 | { |