diff options
| author | Matt Kraai <kraai@debian.org> | 2001-02-01 19:21:20 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-02-01 19:21:20 +0000 |
| commit | f2cc2762bb273fbabe8c2eadeb3b8669550582f0 (patch) | |
| tree | e1bc52067709069328f058b80b9a1273c7c240d2 /applets/busybox.c | |
| parent | 05e782ddd3dc58245c889529bb8aeeaddf24bf71 (diff) | |
| download | busybox-w32-f2cc2762bb273fbabe8c2eadeb3b8669550582f0.tar.gz busybox-w32-f2cc2762bb273fbabe8c2eadeb3b8669550582f0.tar.bz2 busybox-w32-f2cc2762bb273fbabe8c2eadeb3b8669550582f0.zip | |
Create find_applet_by_name function. Save 32 bytes.
Diffstat (limited to 'applets/busybox.c')
| -rw-r--r-- | applets/busybox.c | 11 |
1 files changed, 4 insertions, 7 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) | |||
| 87 | 87 | ||
| 88 | int main(int argc, char **argv) | 88 | int main(int argc, char **argv) |
| 89 | { | 89 | { |
| 90 | struct BB_applet search_applet, *applet; | 90 | struct BB_applet *applet; |
| 91 | const char *s; | 91 | const char *s; |
| 92 | 92 | ||
| 93 | for (s = applet_name = argv[0]; *s != '\0';) { | 93 | for (s = applet_name = argv[0]; *s != '\0';) { |
| 94 | if (*s++ == '/') | 94 | if (*s++ == '/') |
| @@ -104,12 +104,9 @@ int main(int argc, char **argv) | |||
| 104 | #endif | 104 | #endif |
| 105 | 105 | ||
| 106 | /* Do a binary search to find the applet entry given the name. */ | 106 | /* Do a binary search to find the applet entry given the name. */ |
| 107 | search_applet.name = applet_name; | 107 | if ((applet = find_applet_by_name(applet_name)) != NULL) { |
| 108 | applet = bsearch(&search_applet, applets, NUM_APPLETS, | ||
| 109 | sizeof(struct BB_applet), applet_name_compare); | ||
| 110 | if (applet != NULL) { | ||
| 111 | if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0) | 108 | if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0) |
| 112 | usage(applet->usage); | 109 | usage(applet->usage); |
| 113 | exit((*(applet->main)) (argc, argv)); | 110 | exit((*(applet->main)) (argc, argv)); |
| 114 | } | 111 | } |
| 115 | 112 | ||