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

skill: parse kill signals separately

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-10-18 22:03:25 +02:00
parent 723ce0dc74
commit 61094186fe
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
skill.c
View File

@ -461,6 +461,26 @@ int snice_prio_option(int *argc, char **argv)
return (int)prio; return (int)prio;
} }
int skill_sig_option(int *argc, char **argv)
{
int i, nargs = *argc;
int signo = -1;
for (i = 1; i < nargs; i++) {
if (argv[i][0] == '-') {
signo = signal_name_to_number(argv[i] + 1);
if (-1 < signo) {
if (nargs - i) {
nargs--;
memmove(argv + i, argv + i + 1,
sizeof(char *) * (nargs - i));
}
return signo;
}
}
}
return signo;
}
#define NO_PRI_VAL ((int)0xdeafbeef) #define NO_PRI_VAL ((int)0xdeafbeef)
static void skillsnice_parse(int argc, static void skillsnice_parse(int argc,
char ** argv, char ** argv,
@ -476,6 +496,8 @@ static void skillsnice_parse(int argc,
if (program == PROG_SNICE) if (program == PROG_SNICE)
prino = snice_prio_option(&argc, argv); prino = snice_prio_option(&argc, argv);
else if (program == PROG_SKILL)
signo = skill_sig_option(&argc, argv);
if (argc == 2 && argv[1][0] == '-') { if (argc == 2 && argv[1][0] == '-') {
if (!strcmp(argv[1], "-L")) { if (!strcmp(argv[1], "-L")) {
@ -502,15 +524,6 @@ static void skillsnice_parse(int argc,
skillsnice_usage(); skillsnice_usage();
} }
force = 0; force = 0;
if (program == PROG_SKILL && signo < 0 && *argptr == '-') {
signo = signal_name_to_number(argptr + 1);
if (signo >= 0) {
/* found a signal */
if (!NEXTARG)
break;
continue;
}
}
/* If '-' found, collect any flags. (but lone "-" is a tty) */ /* If '-' found, collect any flags. (but lone "-" is a tty) */
if (*argptr == '-' && argptr[1]) { if (*argptr == '-' && argptr[1]) {
argptr++; argptr++;