emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pkill: fix signal spec regression

Browse Source 
Commig a5d9c40262 caused signal spec,
again, to be required as first option; for example

pkill -3 <program>	# worked
pkill <program> -3	# did not

This commit fixes the regression, without breaking option -u <numeric>
argument, assuming no-one is using negative numeric UID specifications
with space after -u && the argument.  IMHO such use case is rare enough
to be broken.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-06-24 13:30:22 +02:00
parent cba9bdbc16
commit d45456fb8a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pgrep.c
View File

@ -563,18 +563,19 @@ static struct el * select_procs (int *num)
int signal_option(int *argc, char **argv)
{
int sig;
int i = 1;
if (*argc > 2 && argv[1][0] == '-') {
sig = signal_name_to_number(argv[i] + 1);
if (sig == -1 && isdigit(argv[1][1]))
sig = atoi(argv[1] + 1);
if (-1 < sig) {
memmove(argv + i, argv + i + 1,
sizeof(char *) * (*argc - i));
(*argc)--;
return sig;
int i;
for (i = 1; i < *argc; i++) {
if (argv[i][0] == '-') {
sig = signal_name_to_number(argv[i] + 1);
if (sig == -1 && isdigit(argv[i][1]))
sig = atoi(argv[i] + 1);
if (-1 < sig) {
memmove(argv + i, argv + i + 1,
sizeof(char *) * (*argc - i));
(*argc)--;
return sig;
}
}
i++;
}
return -1;
}