diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 23:03:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 23:03:30 +0000 |
| commit | 80d14beae9ebe64d3be1e6c2771f292977cf6d2c (patch) | |
| tree | d0dd803ca8b6c70521895fd5ec71ef532861b8e4 /libbb/error_msg_and_die.c | |
| parent | 89054964443b5cb14cba673b86306f534810404a (diff) | |
| download | busybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.gz busybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.bz2 busybox-w32-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.zip | |
Rename two config options:
FEATURE_SH_STANDALONE_SHELL => FEATURE_SH_STANDALONE
FEATURE_EXEC_PREFER_APPLETS => FEATURE_PREFER_APPLETS
Make SH_STANDALONE depend on PREFER_APPLETS.
getopt.c: more randomconfig-induced fixes
Diffstat (limited to 'libbb/error_msg_and_die.c')
| -rw-r--r-- | libbb/error_msg_and_die.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 4a9049364..4115046c2 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c | |||
| @@ -10,14 +10,14 @@ | |||
| 10 | #include "libbb.h" | 10 | #include "libbb.h" |
| 11 | 11 | ||
| 12 | int die_sleep; | 12 | int die_sleep; |
| 13 | #if ENABLE_FEATURE_EXEC_PREFER_APPLETS | 13 | #if ENABLE_FEATURE_PREFER_APPLETS |
| 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_EXEC_PREFER_APPLETS && die_sleep < 0) { | 20 | if (ENABLE_FEATURE_PREFER_APPLETS && die_sleep < 0) { |
| 21 | /* Special case. We arrive here if NOFORK applet | 21 | /* Special case. We arrive here if NOFORK applet |
| 22 | * calls xfunc, which then decides to die. | 22 | * calls xfunc, which then decides to die. |
| 23 | * We don't die, but jump instead back to caller. | 23 | * We don't die, but jump instead back to caller. |