fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify logic in kill(1)

Browse Source
This commit is contained in:
sin 2014-11-11 17:28:27 +00:00
parent e4e47a617e
commit f06ada4592
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
kill.c
View File

@ -37,7 +37,6 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
char *end; char *end;
const char *name;
int ret = 0; int ret = 0;
int sig = SIGTERM; int sig = SIGTERM;
pid_t pid; pid_t pid;
@ -48,20 +47,8 @@ main(int argc, char *argv[])
usage(); usage();
argc--, argv++; argc--, argv++;
if (strcmp(argv[0], "--") == 0) { if (strcmp(argv[0], "-l") == 0) {
argc--, argv++; argc--, argv++;
} else if (argv[0][0] == '-' && isdigit(argv[0][1])) {
/* handle XSI extension -signum */
errno = 0;
sig = strtol(&argv[0][1], &end, 10);
if (*end != '\0' || errno != 0)
eprintf("%s: bad signal number\n", &argv[0][1]);
sig2name(sig);
argc--, argv++;
} else if (strcmp(argv[0], "-l") == 0) {
argc--, argv++;
if (argc > 0 && strcmp(argv[0], "--") == 0)
argc--, argv++;
if (argc == 0) { if (argc == 0) {
for (i = 0; i < LEN(sigs); i++) for (i = 0; i < LEN(sigs); i++)
puts(sigs[i].name); puts(sigs[i].name);
@ -76,22 +63,33 @@ main(int argc, char *argv[])
sig = WTERMSIG(sig); sig = WTERMSIG(sig);
puts(sig2name(sig)); puts(sig2name(sig));
exit(0); exit(0);
} else {
if (strcmp(argv[0], "-s") == 0) {
argc--, argv++;
if (argc > 0 && strcmp(argv[0], "--") == 0)
argc--, argv++;
if (argc == 0)
usage();
name = argv[0];
} else {
/* assume XSI extension -signame */
name = &argv[0][1];
}
sig = strcmp(name, "0") == 0 ? 0 : name2sig(name);
argc--, argv++;
} }
if (strcmp(argv[0], "-s") == 0) {
argc--, argv++;
if (argc == 0)
usage();
sig = strcmp(argv[0], "0") == 0 ? 0 : name2sig(argv[0]);
argc--, argv++;
} else if (argv[0][0] == '-') {
if (isdigit(argv[0][1])) {
/* handle XSI extension -signum */
errno = 0;
sig = strtol(&argv[0][1], &end, 10);
if (*end != '\0' || errno != 0)
eprintf("%s: bad signal number\n", &argv[0][1]);
sig2name(sig);
argc--, argv++;
} else if (argv[0][1] != '-') {
/* handle XSI extension -signame */
sig = strcmp(&argv[0][1], "0") == 0 ? 0 : name2sig(&argv[0][1]);
argc--, argv++;
}
}
if (argc > 0 && strcmp(argv[0], "--") == 0)
argc--, argv++;
if (argc == 0) if (argc == 0)
usage(); usage();