aboutsummaryrefslogtreecommitdiff
path: root/include/applets.h
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-04-10 23:03:30 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-04-10 23:03:30 +0000
commit80d14beae9ebe64d3be1e6c2771f292977cf6d2c (patch)
treed0dd803ca8b6c70521895fd5ec71ef532861b8e4 /include/applets.h
parent89054964443b5cb14cba673b86306f534810404a (diff)
downloadbusybox-80d14beae9ebe64d3be1e6c2771f292977cf6d2c.tar.gz
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 'include/applets.h')
-rw-r--r--include/applets.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/applets.h b/include/applets.h
index d05299b69..67f7db4a6 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -56,8 +56,8 @@ s - suid type:
# define APPLET(name,l,s) { #name, name##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) },
# define APPLET_NOUSAGE(name,main,l,s) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) },
# define APPLET_ODDNAME(name,main,l,s,name2) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) },
-# define APPLET_NOEXEC(name,main,l,s,name2) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) USE_FEATURE_EXEC_PREFER_APPLETS(,1) },
-# define APPLET_NOFORK(name,main,l,s,name2) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) USE_FEATURE_EXEC_PREFER_APPLETS(,1 ,1) },
+# define APPLET_NOEXEC(name,main,l,s,name2) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) USE_FEATURE_PREFER_APPLETS(,1) },
+# define APPLET_NOFORK(name,main,l,s,name2) { #name, main##_main USE_FEATURE_INSTALLER(,l) USE_FEATURE_SUID(,s) USE_FEATURE_PREFER_APPLETS(,1 ,1) },
#endif
#if ENABLE_INSTALL_NO_USR