emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make "busybox" w/o args work again, and save 10 bytes in the process.

Browse Source
This commit is contained in:
Denis Vlasenko 2007-04-18 21:00:21 +00:00
parent 55b2de71d7
commit 2ace1e3f07
1 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
applets/applets.c
View File

@ -525,7 +525,46 @@ static void install_links(const char *busybox, int use_symbolic_links)
/* If we were called as "busybox..." */ /* If we were called as "busybox..." */
static int busybox_main(char **argv) static int busybox_main(char **argv)
{ {
if (ENABLE_FEATURE_INSTALLER && argv[1] && !strcmp(argv[1], "--install")) { if (!argv[1]) {
/* Called without arguments */
const struct bb_applet *a;
int col, output_width;
help:
output_width = 80;
if (ENABLE_FEATURE_AUTOWIDTH) {
/* Obtain the terminal width. */
get_terminal_width_height(0, &output_width, NULL);
}
/* leading tab and room to wrap */
output_width -= sizeof("start-stop-daemon, ") + 8;
printf("%s\n"
"Copyright (C) 1998-2006  Erik Andersen, Rob Landley, and others.\n"
"Licensed under GPLv2.  See source distribution for full notice.\n"
"\n"
"Usage: busybox [function] [arguments]...\n"
" or: [function] [arguments]...\n"
"\n"
"\tBusyBox is a multi-call binary that combines many common Unix\n"
"\tutilities into a single executable. Most people will create a\n"
"\tlink to busybox for each function they wish to use and BusyBox\n"
"\twill act like whatever it was invoked as!\n"
"\nCurrently defined functions:\n", bb_msg_full_version);
col = 0;
a = applets;
while (a->name) {
if (col > output_width) {
puts(",");
col = 0;
}
col += printf("%s%s", (col ? ", " : "\t"), a->name);
a++;
}
puts("\n");
return 0;
}
if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
int use_symbolic_links = 0; int use_symbolic_links = 0;
char *busybox; char *busybox;
@ -544,57 +583,20 @@ static int busybox_main(char **argv)
return 0; return 0;
} }
/* Deal with --help. Also print help when called with no arguments */ if (strcmp(argv[1], "--help") == 0) {
/* "busybox --help [<applet>]" */
if (!argv[1] || !strcmp(argv[1], "--help") ) { if (!argv[2])
if (argv[2]) { goto help;
/* set name for proper "<name>: applet not found" */ /* convert to "<applet> --help" */
applet_name = argv[2]; argv[0] = argv[2];
argv[2] = NULL; argv[2] = NULL;
run_applet_and_exit(applet_name, argv);
} else { } else {
const struct bb_applet *a; /* "busybox <applet> arg1 arg2 ..." */
int col, output_width; argv++;
output_width = 80 - sizeof("start-stop-daemon, ") - 8;
if (ENABLE_FEATURE_AUTOWIDTH) {
/* Obtain the terminal width. */
get_terminal_width_height(0, &output_width, NULL);
/* leading tab and room to wrap */
output_width -= sizeof("start-stop-daemon, ") + 8;
} }
/* we want "<argv[0]>: applet not found", not "busybox: ..." */
printf("%s\n" applet_name = argv[0];
"Copyright (C) 1998-2006  Erik Andersen, Rob Landley, and others.\n" run_applet_and_exit(argv[0], argv);
"Licensed under GPLv2.  See source distribution for full notice.\n"
"\n"
"Usage: busybox [function] [arguments]...\n"
" or: [function] [arguments]...\n"
"\n"
"\tBusyBox is a multi-call binary that combines many common Unix\n"
"\tutilities into a single executable. Most people will create a\n"
"\tlink to busybox for each function they wish to use and BusyBox\n"
"\twill act like whatever it was invoked as!\n"
"\nCurrently defined functions:\n", bb_msg_full_version);
col = 0;
a = applets;
while (a->name) {
col += printf("%s%s", (col ? ", " : "\t"), a->name);
a++;
if (col > output_width && a->name) {
puts(",");
col = 0;
}
}
puts("\n");
return 0;
}
} else {
/* we want "<argv[1]>: applet not found", not "busybox: ..." */
applet_name = argv[1];
run_applet_and_exit(argv[1], argv + 1);
}
bb_error_msg_and_die("applet not found"); bb_error_msg_and_die("applet not found");
} }