fix a regression introduced in r237618 that would result in

killall confusing killall -INT with killall -I (interactive
confirmation) which resulted in the wrong signal (TERM)
being delivered to the process(s).

Discussed with:	delphij
MFC after:	2 weeks
This commit is contained in:
Christian S.J. Peron 2014-01-17 03:30:24 +00:00
parent d9e1bc4f0d
commit dedf0f34ad
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=260800

View File

@ -144,9 +144,6 @@ main(int ac, char **av)
if (**av == '-') {
++*av;
switch (**av) {
case 'I':
Iflag = 1;
break;
case 'j':
++*av;
if (**av == '\0') {
@ -213,6 +210,15 @@ main(int ac, char **av)
case 'z':
zflag++;
break;
case 'I':
/*
* NB: do not confuse -INT with -I
*/
if (strncmp(*av, "INT", 3) != 0) {
Iflag = 1;
break;
}
/* FALLTHROUGH */
default:
if (isalpha((unsigned char)**av)) {
if (strncasecmp(*av, "SIG", 3) == 0)