aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
Diffstat (limited to 'applets')
-rw-r--r--applets/applets.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 6f38ccee8..958defe75 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -541,7 +541,7 @@ static int busybox_main(int argc, char **argv)
541 if (argc > 2) { 541 if (argc > 2) {
542 /* set name for proper "<name>: applet not found" */ 542 /* set name for proper "<name>: applet not found" */
543 applet_name = argv[2]; 543 applet_name = argv[2];
544 run_applet_by_name(applet_name, 2, argv); 544 run_applet_and_exit(applet_name, 2, argv);
545 } else { 545 } else {
546 const struct bb_applet *a; 546 const struct bb_applet *a;
547 int col, output_width; 547 int col, output_width;
@@ -582,7 +582,7 @@ static int busybox_main(int argc, char **argv)
582 } else { 582 } else {
583 /* we want "<argv[1]>: applet not found", not "busybox: ..." */ 583 /* we want "<argv[1]>: applet not found", not "busybox: ..." */
584 applet_name = argv[1]; 584 applet_name = argv[1];
585 run_applet_by_name(argv[1], argc - 1, argv + 1); 585 run_applet_and_exit(argv[1], argc - 1, argv + 1);
586 } 586 }
587 587
588 bb_error_msg_and_die("applet not found"); 588 bb_error_msg_and_die("applet not found");
@@ -598,7 +598,7 @@ void run_current_applet_and_exit(int argc, char **argv)
598 exit(current_applet->main(argc, argv)); 598 exit(current_applet->main(argc, argv));
599} 599}
600 600
601void run_applet_by_name(const char *name, int argc, char **argv) 601void run_applet_and_exit(const char *name, int argc, char **argv)
602{ 602{
603 current_applet = find_applet_by_name(name); 603 current_applet = find_applet_by_name(name);
604 if (current_applet) 604 if (current_applet)
@@ -633,6 +633,6 @@ int main(int argc, char **argv)
633 if (ENABLE_LOCALE_SUPPORT && getpid() != 1) 633 if (ENABLE_LOCALE_SUPPORT && getpid() != 1)
634 setlocale(LC_ALL, ""); 634 setlocale(LC_ALL, "");
635 635
636 run_applet_by_name(applet_name, argc, argv); 636 run_applet_and_exit(applet_name, argc, argv);
637 bb_error_msg_and_die("applet not found"); 637 bb_error_msg_and_die("applet not found");
638} 638}