diff options
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/applets.c | 2 | ||||
| -rw-r--r-- | applets/busybox.c | 15 | ||||
| -rw-r--r-- | applets/individual.c | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/applets/applets.c b/applets/applets.c index d5b2672a0..d615ffcd8 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -469,7 +469,7 @@ void run_applet_by_name(const char *name, int argc, char **argv) /* Do a binary search to find the applet entry given the name. */ applet_using = find_applet_by_name(name); if (applet_using) { - bb_applet_name = applet_using->name; + applet_name = applet_using->name; if(argc==2 && !strcmp(argv[1], "--help")) bb_show_usage(); if(ENABLE_FEATURE_SUID) check_suid(applet_using); exit((*(applet_using->main))(argc, argv)); diff --git a/applets/busybox.c b/applets/busybox.c index 53eb363ac..625a492f2 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -6,7 +6,7 @@ */ #include "busybox.h" -const char *bb_applet_name ATTRIBUTE_EXTERNALLY_VISIBLE; +const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE; #ifdef CONFIG_FEATURE_INSTALLER /* @@ -59,16 +59,16 @@ int main(int argc, char **argv) { const char *s; - bb_applet_name=argv[0]; - if (*bb_applet_name == '-') bb_applet_name++; - for (s = bb_applet_name; *s ;) - if (*(s++) == '/') bb_applet_name = s; + applet_name=argv[0]; + if (*applet_name == '-') applet_name++; + for (s = applet_name; *s ;) + if (*(s++) == '/') applet_name = s; /* Set locale for everybody except `init' */ if(ENABLE_LOCALE_SUPPORT && getpid() != 1) setlocale(LC_ALL, ""); - run_applet_by_name(bb_applet_name, argc, argv); + run_applet_by_name(applet_name, argc, argv); bb_error_msg_and_die("applet not found"); } @@ -106,7 +106,8 @@ int busybox_main(int argc, char **argv) if (argc==1 || !strcmp(argv[1],"--help") ) { if (argc>2) { - run_applet_by_name(bb_applet_name=argv[2], 2, argv); + applet_name = argv[2]; + run_applet_by_name(applet_name, 2, argv); } else { const struct BB_applet *a; int col, output_width; diff --git a/applets/individual.c b/applets/individual.c index 911f760a6..b5d1e1298 100644 --- a/applets/individual.c +++ b/applets/individual.c @@ -5,7 +5,7 @@ * Licensed under GPL version 2, see file LICENSE in this tarball for details */ -const char *bb_applet_name; +const char *applet_name; #include <stdio.h> #include <stdlib.h> @@ -14,7 +14,7 @@ const char *bb_applet_name; int main(int argc, char *argv[]) { - bb_applet_name=argv[0]; + applet_name=argv[0]; return APPLET_main(argc,argv); } |