Mercurial > hg > toybox
changeset 767:979d038c1688
Minor cleanups.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 23 Dec 2012 15:07:28 -0600 |
parents | 5d435b48da8d |
children | 017b8fd3c9ac |
files | toys/lsb/killall.c |
diffstat | 1 files changed, 13 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/toys/lsb/killall.c Sun Dec 16 16:51:30 2012 +0100 +++ b/toys/lsb/killall.c Sun Dec 23 15:07:28 2012 -0600 @@ -10,14 +10,14 @@ bool "killall" default y help - usage: killall [-l] [-qv] [-SIG] PROCESS_NAME... + usage: killall [-l] [-iqv] [-SIG] PROCESS_NAME... Send a signal (default: TERM) to all processes with the given names. + -i ask for confirmation before killing -l print list of all available signals - -i ask for confirmation before killing + -q don't print any warnings or error messages -v report if the signal was successfully sent - -q don't print any warnings or error messages */ #define FOR_killall @@ -34,8 +34,8 @@ if (pid == TT.cur_pid) return 1; - if(toys.optflags & FLAG_i) { - snprintf(toybuf, sizeof(toybuf), "Signal %s(%d) ?", name, pid); + if (toys.optflags & FLAG_i) { + sprintf(toybuf, "Signal %s(%d) ?", name, pid); if (yesno(toybuf, 0) == 0) return 1; } @@ -51,34 +51,27 @@ void killall_main(void) { - char **names; + char **names = toys.optargs; + + TT.signum = SIGTERM; + toys.exitval++; if (toys.optflags & FLAG_l) { sig_to_num(NULL); return; } - TT.signum = SIGTERM; - toys.exitval++; - - if (!*toys.optargs) { - toys.exithelp++; - error_exit("Process name missing!"); - } - - names = toys.optargs; - if (**names == '-') { if (0 > (TT.signum = sig_to_num((*names)+1))) { if (toys.optflags & FLAG_q) exit(1); error_exit("Invalid signal"); } names++; + } - if (!*names) { - toys.exithelp++; - error_exit("Process name missing!"); - } + if (!*names) { + toys.exithelp++; + error_exit("Process name missing!"); } TT.cur_pid = getpid();