This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
This commit is contained in:
Eric Andersen
2001-02-14 21:23:06 +00:00
parent 68be2ab914
commit 67991cf824
198 changed files with 702 additions and 3979 deletions

View File

@ -124,22 +124,19 @@ const struct signal_name signames[] = {
extern int kill_main(int argc, char **argv)
{
int whichApp, sig = SIGTERM;
const char *appUsage;
#ifdef BB_KILLALL
/* Figure out what we are trying to do here */
whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL;
appUsage = (whichApp == KILLALL)? killall_usage : kill_usage;
#else
whichApp = KILL;
appUsage = kill_usage;
#endif
argc--;
argv++;
/* Parse any options */
if (argc < 1)
usage(appUsage);
show_usage();
while (argc > 0 && **argv == '-') {
while (*++(*argv)) {
@ -163,7 +160,7 @@ extern int kill_main(int argc, char **argv)
}
break;
case '-':
usage(appUsage);
show_usage();
default:
{
if (isdigit(**argv)) {