diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 13 | ||||
| -rw-r--r-- | include/busybox.h | 46 | ||||
| -rw-r--r-- | include/libbb.h | 11 |
3 files changed, 34 insertions, 36 deletions
diff --git a/include/applets.h b/include/applets.h index 2f31a58..f35a1d8 100644 --- a/include/applets.h +++ b/include/applets.h @@ -59,12 +59,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 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_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) }, + static struct bb_applet applets[] = { /* name, main, location, need_suid */ +# define APPLET(name,l,s) { #name, #name, l, s }, +# define APPLET_NOUSAGE(name,main,l,s) { #name, #main, l, s }, +# define APPLET_ODDNAME(name,main,l,s,name2) { #name, #main, l, s }, +# define APPLET_NOEXEC(name,main,l,s,name2) { #name, #main, l, s, 1 }, +# define APPLET_NOFORK(name,main,l,s,name2) { #name, #main, l, s, 1, 1 }, #endif #if ENABLE_INSTALL_NO_USR @@ -385,7 +385,6 @@ 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(NAME_MAIN_CNAME) && !defined(MAKE_USAGE) - { NULL } }; #endif diff --git a/include/busybox.h b/include/busybox.h index 7ef3690..f99901a 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -9,8 +9,7 @@ #include "libbb.h" -#if ENABLE_FEATURE_INSTALLER -/* order matters: used as index into "install_dir[]" in busybox.c */ +/* order matters: used as index into "install_dir[]" in appletlib.c */ typedef enum bb_install_loc_t { _BB_DIR_ROOT = 0, _BB_DIR_BIN, @@ -18,40 +17,41 @@ typedef enum bb_install_loc_t { _BB_DIR_USR_BIN, _BB_DIR_USR_SBIN } bb_install_loc_t; -#endif -#if ENABLE_FEATURE_SUID typedef enum bb_suid_t { _BB_SUID_NEVER = 0, _BB_SUID_MAYBE, _BB_SUID_ALWAYS } bb_suid_t; -#endif -struct bb_applet { - const char *name; - int (*main) (int argc, char **argv); -#if ENABLE_FEATURE_INSTALLER - __extension__ enum bb_install_loc_t install_loc:8; + +/* Defined in appletlib.c (by including generated applet_tables.h) */ +/* Keep in sync with applets/applet_tables.c! */ +extern const char applet_names[]; +extern int (*const applet_mains[])(int argc, char **argv); + +#if ENABLE_FEATURE_INSTALLER || ENABLE_FEATURE_PREFER_APPLETS +extern const uint32_t applet_nameofs[]; +#else +extern const uint16_t applet_nameofs[]; #endif + #if ENABLE_FEATURE_SUID - __extension__ enum bb_suid_t need_suid:8; +#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x3fff)) +#define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3) +#else +#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0xffff)) #endif -#if ENABLE_FEATURE_PREFER_APPLETS - /* true if instead of fork(); exec("applet"); waitpid(); - * one can do fork(); exit(applet_main(argc,argv)); waitpid(); */ - unsigned char noexec; - /* Even nicer */ - /* true if instead of fork(); exec("applet"); waitpid(); - * one can simply call applet_main(argc,argv); */ - unsigned char nofork; + +#if ENABLE_FEATURE_INSTALLER +#define APPLET_INSTALL_LOC(i) ((applet_nameofs[i] >> 16) & 0x7) #endif -}; +#if ENABLE_FEATURE_PREFER_APPLETS +#define APPLET_IS_NOFORK(i) (applet_nameofs[i] & (1 << 19)) +#define APPLET_IS_NOEXEC(i) (applet_nameofs[i] & (1 << 20)) +#endif -/* Defined in appletlib.c */ -extern const struct bb_applet applets[]; -extern const unsigned short NUM_APPLETS; /* Length of these names has effect on size of libbusybox * and "individual" binaries. Keep them short. diff --git a/include/libbb.h b/include/libbb.h index 095647d..2b92821 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -550,7 +550,6 @@ void clear_username_cache(void); enum { USERNAME_MAX_SIZE = 16 - sizeof(int) }; -struct bb_applet; int execable_file(const char *name); char *find_execable(const char *filename); int exists_execable(const char *filename); @@ -562,7 +561,7 @@ int exists_execable(const char *filename); int bb_execvp(const char *file, char *const argv[]); #define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd) #define BB_EXECLP(prog,cmd,...) \ - execlp((find_applet_by_name(prog)) ? CONFIG_BUSYBOX_EXEC_PATH : prog, \ + execlp((find_applet_by_name(prog) >= 0) ? CONFIG_BUSYBOX_EXEC_PATH : prog, \ cmd, __VA_ARGS__) #else #define BB_EXECVP(prog,cmd) execvp(prog,cmd) @@ -600,8 +599,8 @@ struct nofork_save_area { void save_nofork_data(struct nofork_save_area *save); void restore_nofork_data(struct nofork_save_area *save); /* Does NOT check that applet is NOFORK, just blindly runs it */ -int run_nofork_applet(const struct bb_applet *a, char **argv); -int run_nofork_applet_prime(struct nofork_save_area *old, const struct bb_applet *a, char **argv); +int run_nofork_applet(int applet_no, char **argv); +int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv); /* Helpers for daemonization. * @@ -786,10 +785,10 @@ const struct hwtype *get_hwntype(int type); #ifndef BUILD_INDIVIDUAL -extern const struct bb_applet *find_applet_by_name(const char *name); +extern int find_applet_by_name(const char *name); /* Returns only if applet is not found. */ extern void run_applet_and_exit(const char *name, char **argv); -extern void run_appletstruct_and_exit(const struct bb_applet *a, char **argv) ATTRIBUTE_NORETURN; +extern void run_applet_no_and_exit(int a, char **argv) ATTRIBUTE_NORETURN; #endif extern int match_fstype(const struct mntent *mt, const char *fstypes); |