From c44ab01b75aba758fe0aff4b34b25d733e370dc2 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 9 Apr 2007 03:11:58 +0000 Subject: Improve STANDALONE_SHELL. "safe" applets are renamed NOEXEC applets and now this fact is recorded in applets.h, not ash.c. Several fixes to "--help + STANDALONE_SHELL" scenarios. function old new delta run_current_applet_and_exit - 355 +355 arith 2064 2073 +9 refresh 1148 1156 +8 getopt32 1068 1073 +5 telnet_main 1510 1514 +4 md5_sha1_sum_main 565 566 +1 xstrtoul_range_sfx 255 251 -4 packed_usage 22523 22514 -9 tryexec 255 203 -52 static.safe_applets 152 - -152 .rodata 131320 131128 -192 run_applet_by_name 869 506 -363 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 5/5 up/down: 382/-772) Total: -390 bytes ./busybox ash -c 'i=20000; while test $i != 0; do touch z; i=$((i-1)); done' runs more than twice as fast with STANDALONE_SHELL versus without. --- include/libbb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/libbb.h') diff --git a/include/libbb.h b/include/libbb.h index 8f43aeafc..4fc5d183f 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -662,9 +662,11 @@ const struct hwtype *get_hwntype(int type); #ifndef BUILD_INDIVIDUAL -extern struct BB_applet *find_applet_by_name(const char *name); +struct BB_applet; +extern const struct BB_applet *find_applet_by_name(const char *name); /* Returns only if applet is not found. */ extern void run_applet_by_name(const char *name, int argc, char **argv); +extern void run_current_applet_and_exit(int argc, char **argv) ATTRIBUTE_NORETURN; #endif extern int match_fstype(const struct mntent *mt, const char *fstypes); @@ -870,6 +872,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ }; #define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c") +extern const struct BB_applet *current_applet; extern const char *applet_name; extern const char BB_BANNER[]; -- cgit v1.2.3