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 /include | |
| parent | 89054964443b5cb14cba673b86306f534810404a (diff) | |
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')
| -rw-r--r-- | include/applets.h | 4 | ||||
| -rw-r--r-- | include/busybox.h | 2 | ||||
| -rw-r--r-- | include/libbb.h | 5 |
3 files changed, 6 insertions, 5 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 diff --git a/include/busybox.h b/include/busybox.h index 380de9ab8..290ad17f2 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -37,7 +37,7 @@ struct bb_applet { #if ENABLE_FEATURE_SUID __extension__ enum bb_suid_t need_suid:8; #endif -#if ENABLE_FEATURE_EXEC_PREFER_APPLETS +#if ENABLE_FEATURE_PREFER_APPLETS /* true if instead if fork(); exec("applet"); waitpid(); * one can do fork(); exit(applet_main(argc,argv)); waitpid(); */ unsigned char noexec; diff --git a/include/libbb.h b/include/libbb.h index 2be13891c..04bf6a5cd 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -502,7 +502,7 @@ int execable_file(const char *name); char *find_execable(const char *filename); int exists_execable(const char *filename); -#if ENABLE_FEATURE_EXEC_PREFER_APPLETS +#if ENABLE_FEATURE_PREFER_APPLETS int bb_execvp(const char *file, char *const argv[]); #define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd) #define BB_EXECLP(prog,cmd,...) \ @@ -609,7 +609,8 @@ llist_t *llist_rev(llist_t *list); int write_pidfile(const char *path); #define remove_pidfile(f) ((void)unlink(f)) #else -#define write_pidfile(f) TRUE +/* Why? #defining it to 1 gives "warning: statement with no effect"... */ +static ATTRIBUTE_ALWAYS_INLINE int write_pidfile(const char *path) { return 1; } #define remove_pidfile(f) ((void)0) #endif |