diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-04-21 00:03:36 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-04-21 00:03:36 +0000 |
commit | 33207d64f58e44be7669926e7025bd54cd9e3d88 (patch) | |
tree | 8e78848fb5cf60d0455feec2e68de6e41c0e5775 /libbb | |
parent | 46726e08a35c42bf435855ab70b2d806f36cfbcd (diff) | |
download | busybox-w32-33207d64f58e44be7669926e7025bd54cd9e3d88.tar.gz busybox-w32-33207d64f58e44be7669926e7025bd54cd9e3d88.tar.bz2 busybox-w32-33207d64f58e44be7669926e7025bd54cd9e3d88.zip |
hush: begin fixing non-functional job control
git-svn-id: svn://busybox.net/trunk/busybox@18505 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/error_msg_and_die.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 4115046c2..20d971591 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c | |||
@@ -10,14 +10,16 @@ | |||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | int die_sleep; | 12 | int die_sleep; |
13 | #if ENABLE_FEATURE_PREFER_APPLETS | 13 | #if ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH |
14 | jmp_buf die_jmp; | 14 | jmp_buf die_jmp; |
15 | #endif | 15 | #endif |
16 | 16 | ||
17 | void xfunc_die(void) | 17 | void xfunc_die(void) |
18 | { | 18 | { |
19 | if (die_sleep) { | 19 | if (die_sleep) { |
20 | if (ENABLE_FEATURE_PREFER_APPLETS && die_sleep < 0) { | 20 | if ((ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH) |
21 | && die_sleep < 0 | ||
22 | ) { | ||
21 | /* Special case. We arrive here if NOFORK applet | 23 | /* Special case. We arrive here if NOFORK applet |
22 | * calls xfunc, which then decides to die. | 24 | * calls xfunc, which then decides to die. |
23 | * We don't die, but jump instead back to caller. | 25 | * We don't die, but jump instead back to caller. |