aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
Diffstat (limited to 'applets')
-rw-r--r--applets/applets.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 55f8e6b23..3b4f395c9 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -28,7 +28,6 @@
28#endif 28#endif
29 29
30 30
31const struct bb_applet *current_applet;
32const char *applet_name; 31const char *applet_name;
33#if !BB_MMU 32#if !BB_MMU
34bool re_execed; 33bool re_execed;
@@ -507,7 +506,7 @@ static int busybox_main(char **argv)
507 bb_error_msg_and_die("applet not found"); 506 bb_error_msg_and_die("applet not found");
508} 507}
509 508
510void run_current_applet_and_exit(char **argv) 509void run_appletstruct_and_exit(const struct bb_applet *applet, char **argv)
511{ 510{
512 int argc = 1; 511 int argc = 1;
513 512
@@ -518,19 +517,19 @@ void run_current_applet_and_exit(char **argv)
518 optind = 1; 517 optind = 1;
519 xfunc_error_retval = EXIT_FAILURE; 518 xfunc_error_retval = EXIT_FAILURE;
520 519
521 applet_name = current_applet->name; 520 applet_name = applet->name;
522 if (argc == 2 && !strcmp(argv[1], "--help")) 521 if (argc == 2 && !strcmp(argv[1], "--help"))
523 bb_show_usage(); 522 bb_show_usage();
524 if (ENABLE_FEATURE_SUID) 523 if (ENABLE_FEATURE_SUID)
525 check_suid(current_applet); 524 check_suid(applet);
526 exit(current_applet->main(argc, argv)); 525 exit(applet->main(argc, argv));
527} 526}
528 527
529void run_applet_and_exit(const char *name, char **argv) 528void run_applet_and_exit(const char *name, char **argv)
530{ 529{
531 current_applet = find_applet_by_name(name); 530 const struct bb_applet *applet = find_applet_by_name(name);
532 if (current_applet) 531 if (applet)
533 run_current_applet_and_exit(argv); 532 run_appletstruct_and_exit(applet, argv);
534 if (!strncmp(name, "busybox", 7)) 533 if (!strncmp(name, "busybox", 7))
535 exit(busybox_main(argv)); 534 exit(busybox_main(argv));
536} 535}