diff options
| author | Matt Kraai <kraai@debian.org> | 2000-07-11 20:03:24 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-07-11 20:03:24 +0000 |
| commit | 7719008a85c69db66e2f948d6779b6a45352018d (patch) | |
| tree | cc30d94c96cd1348ef27cd75c5697007ddb72277 /applets | |
| parent | aec27bca9840e132c2f067c23745f02bd3c7bb45 (diff) | |
| download | busybox-w32-7719008a85c69db66e2f948d6779b6a45352018d.tar.gz busybox-w32-7719008a85c69db66e2f948d6779b6a45352018d.tar.bz2 busybox-w32-7719008a85c69db66e2f948d6779b6a45352018d.zip | |
Added applet_name to contain the applet name.
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/busybox.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 5471db597..218343b4b 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
| @@ -354,6 +354,7 @@ const struct BB_applet applets[] = { | |||
| 354 | {0} | 354 | {0} |
| 355 | }; | 355 | }; |
| 356 | 356 | ||
| 357 | const char *applet_name; | ||
| 357 | 358 | ||
| 358 | #ifdef BB_FEATURE_INSTALLER | 359 | #ifdef BB_FEATURE_INSTALLER |
| 359 | /* | 360 | /* |
| @@ -436,7 +437,6 @@ int uninstall_links() ? | |||
| 436 | int main(int argc, char **argv) | 437 | int main(int argc, char **argv) |
| 437 | { | 438 | { |
| 438 | char *s; | 439 | char *s; |
| 439 | char *name; | ||
| 440 | const struct BB_applet *a = applets; | 440 | const struct BB_applet *a = applets; |
| 441 | 441 | ||
| 442 | #ifdef BB_FEATURE_INSTALLER | 442 | #ifdef BB_FEATURE_INSTALLER |
| @@ -469,12 +469,12 @@ int main(int argc, char **argv) | |||
| 469 | } | 469 | } |
| 470 | #endif /* BB_FEATURE_INSTALLER */ | 470 | #endif /* BB_FEATURE_INSTALLER */ |
| 471 | 471 | ||
| 472 | for (s = name = argv[0]; *s != '\0';) { | 472 | for (s = applet_name = argv[0]; *s != '\0';) { |
| 473 | if (*s++ == '/') | 473 | if (*s++ == '/') |
| 474 | name = s; | 474 | applet_name = s; |
| 475 | } | 475 | } |
| 476 | 476 | ||
| 477 | *argv = name; | 477 | *argv = applet_name; |
| 478 | 478 | ||
| 479 | #ifdef BB_SH | 479 | #ifdef BB_SH |
| 480 | /* Add in a special case hack -- whenever **argv == '-' | 480 | /* Add in a special case hack -- whenever **argv == '-' |
| @@ -484,7 +484,7 @@ int main(int argc, char **argv) | |||
| 484 | #endif | 484 | #endif |
| 485 | 485 | ||
| 486 | while (a->name != 0) { | 486 | while (a->name != 0) { |
| 487 | if (strcmp(name, a->name) == 0) { | 487 | if (strcmp(applet_name, a->name) == 0) { |
| 488 | exit(((*(a->main)) (argc, argv))); | 488 | exit(((*(a->main)) (argc, argv))); |
| 489 | } | 489 | } |
| 490 | a++; | 490 | a++; |