From f2cc2762bb273fbabe8c2eadeb3b8669550582f0 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 1 Feb 2001 19:21:20 +0000 Subject: [PATCH] Create find_applet_by_name function. Save 32 bytes. --- applets/busybox.c | 11 ++++------- busybox.c | 11 ++++------- busybox.h | 2 +- include/busybox.h | 2 +- lash.c | 12 +++++------- sh.c | 12 +++++------- shell/lash.c | 12 +++++------- utility.c | 16 ++++++++++++---- 8 files changed, 37 insertions(+), 41 deletions(-) diff --git a/applets/busybox.c b/applets/busybox.c index f10467a3b..1409efa54 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -87,8 +87,8 @@ static void install_links(const char *busybox, int use_symbolic_links) int main(int argc, char **argv) { - struct BB_applet search_applet, *applet; - const char *s; + struct BB_applet *applet; + const char *s; for (s = applet_name = argv[0]; *s != '\0';) { if (*s++ == '/') @@ -104,12 +104,9 @@ int main(int argc, char **argv) #endif /* Do a binary search to find the applet entry given the name. */ - search_applet.name = applet_name; - applet = bsearch(&search_applet, applets, NUM_APPLETS, - sizeof(struct BB_applet), applet_name_compare); - if (applet != NULL) { + if ((applet = find_applet_by_name(applet_name)) != NULL) { if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0) - usage(applet->usage); + usage(applet->usage); exit((*(applet->main)) (argc, argv)); } diff --git a/busybox.c b/busybox.c index f10467a3b..1409efa54 100644 --- a/busybox.c +++ b/busybox.c @@ -87,8 +87,8 @@ static void install_links(const char *busybox, int use_symbolic_links) int main(int argc, char **argv) { - struct BB_applet search_applet, *applet; - const char *s; + struct BB_applet *applet; + const char *s; for (s = applet_name = argv[0]; *s != '\0';) { if (*s++ == '/') @@ -104,12 +104,9 @@ int main(int argc, char **argv) #endif /* Do a binary search to find the applet entry given the name. */ - search_applet.name = applet_name; - applet = bsearch(&search_applet, applets, NUM_APPLETS, - sizeof(struct BB_applet), applet_name_compare); - if (applet != NULL) { + if ((applet = find_applet_by_name(applet_name)) != NULL) { if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0) - usage(applet->usage); + usage(applet->usage); exit((*(applet->main)) (argc, argv)); } diff --git a/busybox.h b/busybox.h index e332ed412..fc5e8d874 100644 --- a/busybox.h +++ b/busybox.h @@ -88,7 +88,6 @@ extern const struct BB_applet applets[]; #undef PROTOTYPES extern const char *applet_name; -extern int applet_name_compare(const void *x, const void *y); extern void usage(const char *usage) __attribute__ ((noreturn)); extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); @@ -153,6 +152,7 @@ extern char *get_last_path_component(char *path); extern FILE *wfopen(const char *path, const char *mode); extern FILE *xfopen(const char *path, const char *mode); extern void chomp(char *s); +extern struct BB_applet *find_applet_by_name(const char *name); #ifndef DMALLOC extern void *xmalloc (size_t size); diff --git a/include/busybox.h b/include/busybox.h index e332ed412..fc5e8d874 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -88,7 +88,6 @@ extern const struct BB_applet applets[]; #undef PROTOTYPES extern const char *applet_name; -extern int applet_name_compare(const void *x, const void *y); extern void usage(const char *usage) __attribute__ ((noreturn)); extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); @@ -153,6 +152,7 @@ extern char *get_last_path_component(char *path); extern FILE *wfopen(const char *path, const char *mode); extern FILE *xfopen(const char *path, const char *mode); extern void chomp(char *s); +extern struct BB_applet *find_applet_by_name(const char *name); #ifndef DMALLOC extern void *xmalloc (size_t size); diff --git a/lash.c b/lash.c index cc0d78687..87c37caa9 100644 --- a/lash.c +++ b/lash.c @@ -67,7 +67,6 @@ static const int MAX_LINE = 256; /* size of input buffer for cwd data */ static const int MAX_READ = 128; /* size of input buffer for `read' builtin */ #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" -extern size_t NUM_APPLETS; enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE, @@ -1371,7 +1370,8 @@ static int pseudo_exec(struct child_prog *child) { struct built_in_command *x; #ifdef BB_FEATURE_SH_STANDALONE_SHELL - struct BB_applet search_applet, *applet; + struct BB_applet *applet; + const char *name; #endif /* Check if the command matches any of the non-forking builtins. @@ -1404,7 +1404,7 @@ static int pseudo_exec(struct child_prog *child) * /bin/foo invocation will fork and exec /bin/foo, even if * /bin/foo is a symlink to busybox. */ - search_applet.name = child->argv[0]; + name = child->argv[0]; #ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN /* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then @@ -1412,13 +1412,11 @@ static int pseudo_exec(struct child_prog *child) * /bin/cat exists on the filesystem and is _not_ busybox. * Some systems want this, others do not. Choose wisely. :-) */ - search_applet.name = get_last_path_component(search_applet.name); + name = get_last_path_component(name); #endif /* Do a binary search to find the applet entry given the name. */ - applet = bsearch(&search_applet, applets, NUM_APPLETS, - sizeof(struct BB_applet), applet_name_compare); - if (applet != NULL) { + if ((applet = find_applet_by_name(name)) != NULL) { int argc_l; char** argv=child->argv; for(argc_l=0;*argv!=NULL; argv++, argc_l++); diff --git a/sh.c b/sh.c index cc0d78687..87c37caa9 100644 --- a/sh.c +++ b/sh.c @@ -67,7 +67,6 @@ static const int MAX_LINE = 256; /* size of input buffer for cwd data */ static const int MAX_READ = 128; /* size of input buffer for `read' builtin */ #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" -extern size_t NUM_APPLETS; enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE, @@ -1371,7 +1370,8 @@ static int pseudo_exec(struct child_prog *child) { struct built_in_command *x; #ifdef BB_FEATURE_SH_STANDALONE_SHELL - struct BB_applet search_applet, *applet; + struct BB_applet *applet; + const char *name; #endif /* Check if the command matches any of the non-forking builtins. @@ -1404,7 +1404,7 @@ static int pseudo_exec(struct child_prog *child) * /bin/foo invocation will fork and exec /bin/foo, even if * /bin/foo is a symlink to busybox. */ - search_applet.name = child->argv[0]; + name = child->argv[0]; #ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN /* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then @@ -1412,13 +1412,11 @@ static int pseudo_exec(struct child_prog *child) * /bin/cat exists on the filesystem and is _not_ busybox. * Some systems want this, others do not. Choose wisely. :-) */ - search_applet.name = get_last_path_component(search_applet.name); + name = get_last_path_component(name); #endif /* Do a binary search to find the applet entry given the name. */ - applet = bsearch(&search_applet, applets, NUM_APPLETS, - sizeof(struct BB_applet), applet_name_compare); - if (applet != NULL) { + if ((applet = find_applet_by_name(name)) != NULL) { int argc_l; char** argv=child->argv; for(argc_l=0;*argv!=NULL; argv++, argc_l++); diff --git a/shell/lash.c b/shell/lash.c index cc0d78687..87c37caa9 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -67,7 +67,6 @@ static const int MAX_LINE = 256; /* size of input buffer for cwd data */ static const int MAX_READ = 128; /* size of input buffer for `read' builtin */ #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" -extern size_t NUM_APPLETS; enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE, @@ -1371,7 +1370,8 @@ static int pseudo_exec(struct child_prog *child) { struct built_in_command *x; #ifdef BB_FEATURE_SH_STANDALONE_SHELL - struct BB_applet search_applet, *applet; + struct BB_applet *applet; + const char *name; #endif /* Check if the command matches any of the non-forking builtins. @@ -1404,7 +1404,7 @@ static int pseudo_exec(struct child_prog *child) * /bin/foo invocation will fork and exec /bin/foo, even if * /bin/foo is a symlink to busybox. */ - search_applet.name = child->argv[0]; + name = child->argv[0]; #ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN /* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then @@ -1412,13 +1412,11 @@ static int pseudo_exec(struct child_prog *child) * /bin/cat exists on the filesystem and is _not_ busybox. * Some systems want this, others do not. Choose wisely. :-) */ - search_applet.name = get_last_path_component(search_applet.name); + name = get_last_path_component(name); #endif /* Do a binary search to find the applet entry given the name. */ - applet = bsearch(&search_applet, applets, NUM_APPLETS, - sizeof(struct BB_applet), applet_name_compare); - if (applet != NULL) { + if ((applet = find_applet_by_name(name)) != NULL) { int argc_l; char** argv=child->argv; for(argc_l=0;*argv!=NULL; argv++, argc_l++); diff --git a/utility.c b/utility.c index 0a0e652af..69403c8c2 100644 --- a/utility.c +++ b/utility.c @@ -1691,12 +1691,20 @@ FILE *xfopen(const char *path, const char *mode) } #endif -int applet_name_compare(const void *x, const void *y) +static int applet_name_compare(const void *x, const void *y) { - const struct BB_applet *applet1 = x; - const struct BB_applet *applet2 = y; + const char *name = x; + const struct BB_applet *applet = y; - return strcmp(applet1->name, applet2->name); + return strcmp(name, applet->name); +} + +extern size_t NUM_APPLETS; + +struct BB_applet *find_applet_by_name(const char *name) +{ + return bsearch(name, applets, NUM_APPLETS, sizeof(struct BB_applet), + applet_name_compare); } #if defined BB_DD || defined BB_TAIL