diff options
| author | Denis Vlasenko | 2007-04-10 21:38:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-04-10 21:38:30 +0000 |
| commit | 335b63d8d1876ce4e172ebcc9d64544785682244 (patch) | |
| tree | 14183fd728ce51ae10baee70f7d8f72c39d30649 /include/applets.h | |
| parent | 07c394e69b0cfa7cd30e97ffc6edb0d857905f45 (diff) | |
| download | busybox-335b63d8d1876ce4e172ebcc9d64544785682244.zip busybox-335b63d8d1876ce4e172ebcc9d64544785682244.tar.gz | |
make a few struct bb_applet members conditional
rename sllep_and_die -> xfunc_die
make fflush_stdout_and_exit NOFORK-safe
fix some buglets found by randomconfig
Diffstat (limited to 'include/applets.h')
| -rw-r--r-- | include/applets.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/applets.h b/include/applets.h index b59d331..d05299b 100644 --- a/include/applets.h +++ b/include/applets.h @@ -52,12 +52,12 @@ s - suid type: # define APPLET_NOFORK(name,main,l,s,name2) LINK l name #else - const struct BB_applet applets[] = { /* name,main,location,need_suid */ -# define APPLET(name,l,s) {#name,name##_main,l,s}, -# define APPLET_NOUSAGE(name,main,l,s) {#name,main##_main,l,s}, -# define APPLET_ODDNAME(name,main,l,s,name2) {#name,main##_main,l,s}, -# define APPLET_NOEXEC(name,main,l,s,name2) {#name,main##_main,l,s,1}, -# define APPLET_NOFORK(name,main,l,s,name2) {#name,main##_main,l,s,1,1}, + const struct bb_applet applets[] = { /* name, main, location, need_suid */ +# 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) }, #endif #if ENABLE_INSTALL_NO_USR @@ -355,7 +355,7 @@ USE_GUNZIP(APPLET_ODDNAME(zcat, gunzip, _BB_DIR_BIN, _BB_SUID_NEVER, zcat)) USE_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_NEVER)) #if !defined(PROTOTYPES) && !defined(MAKE_USAGE) - { 0, NULL, 0, 0 } + { NULL } }; #endif |