diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
| commit | 075814c60a316cfd088c88f26f75ab21b5850b98 (patch) | |
| tree | f6e33ac693630827deb309faa5fa4931588db57d /libbb/vfork_daemon_rexec.c | |
| parent | 977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff) | |
| parent | f37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff) | |
| download | busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2 busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip | |
Merge branch busybox (up to "ash: comment out free(p) just before...")
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 f488f8e0c..766a89e5f 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c | |||
| @@ -70,7 +70,8 @@ pid_t FAST_FUNC xspawn(char **argv) | |||
| 70 | return pid; | 70 | return pid; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | #if ENABLE_FEATURE_PREFER_APPLETS | 73 | #if ENABLE_FEATURE_PREFER_APPLETS \ |
| 74 | || ENABLE_FEATURE_SH_NOFORK | ||
| 74 | static jmp_buf die_jmp; | 75 | static jmp_buf die_jmp; |
| 75 | static void jump(void) | 76 | static void jump(void) |
| 76 | { | 77 | { |
| @@ -176,7 +177,7 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv) | |||
| 176 | 177 | ||
| 177 | return rc & 0xff; /* don't confuse people with "exitcodes" >255 */ | 178 | return rc & 0xff; /* don't confuse people with "exitcodes" >255 */ |
| 178 | } | 179 | } |
| 179 | #endif /* FEATURE_PREFER_APPLETS */ | 180 | #endif /* FEATURE_PREFER_APPLETS || FEATURE_SH_NOFORK */ |
| 180 | 181 | ||
| 181 | int FAST_FUNC spawn_and_wait(char **argv) | 182 | int FAST_FUNC spawn_and_wait(char **argv) |
| 182 | { | 183 | { |