From 1aa7e477b1b727db77cac2d717f0fcca40587f78 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 28 Nov 2007 06:49:03 +0000 Subject: reorganize applet table. Eliminates pointers to names. Should be a big win for libbusybox. busybox wins too: text data bss dec hex filename 776524 929 9100 786553 c0079 busybox_old 775903 929 9100 785932 bfe0c busybox_unstripped --- include/busybox.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'include/busybox.h') diff --git a/include/busybox.h b/include/busybox.h index 7ef36901a..f99901aa3 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. -- cgit v1.2.3