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


git-svn-id: svn://busybox.net/trunk/busybox@18394 69ca8d6d-28ef-0310-b511-8ec308f3f277

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 @@
 #include "libbb.h"
 
 int die_sleep;
-#if ENABLE_FEATURE_EXEC_PREFER_APPLETS
+#if ENABLE_FEATURE_PREFER_APPLETS
 jmp_buf die_jmp;
 #endif
 
 void xfunc_die(void)
 {
         if (die_sleep) {
-                if (ENABLE_FEATURE_EXEC_PREFER_APPLETS && die_sleep < 0) {
+                if (ENABLE_FEATURE_PREFER_APPLETS && die_sleep < 0) {
                         /* Special case. We arrive here if NOFORK applet
                          * calls xfunc, which then decides to die.
                          * We don't die, but jump instead back to caller.