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

Handle the special-case signal 0 and "0" properly

Browse Source
This commit is contained in:
sin 2014-11-11 17:40:09 +00:00
parent f06ada4592
commit 3ffe690384
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kill.c
View File

@ -69,7 +69,7 @@ main(int argc, char *argv[])
argc--, argv++; argc--, argv++;
if (argc == 0) if (argc == 0)
usage(); usage();
sig = strcmp(argv[0], "0") == 0 ? 0 : name2sig(argv[0]); sig = name2sig(argv[0]);
argc--, argv++; argc--, argv++;
} else if (argv[0][0] == '-') { } else if (argv[0][0] == '-') {
if (isdigit(argv[0][1])) { if (isdigit(argv[0][1])) {
@ -82,7 +82,7 @@ main(int argc, char *argv[])
argc--, argv++; argc--, argv++;
} else if (argv[0][1] != '-') { } else if (argv[0][1] != '-') {
/* handle XSI extension -signame */ /* handle XSI extension -signame */
sig = strcmp(&argv[0][1], "0") == 0 ? 0 : name2sig(&argv[0][1]); sig = name2sig(&argv[0][1]);
argc--, argv++; argc--, argv++;
} }
} }
@ -115,6 +115,8 @@ sig2name(int sig)
{ {
size_t i; size_t i;
if (sig == 0)
return "0";
for (i = 0; i < LEN(sigs); i++) for (i = 0; i < LEN(sigs); i++)
if (sigs[i].sig == sig) if (sigs[i].sig == sig)
return sigs[i].name; return sigs[i].name;
@ -128,6 +130,8 @@ name2sig(const char *name)
{ {
size_t i; size_t i;
if (strcmp(name, "0") == 0)
return 0;
for (i = 0; i < LEN(sigs); i++) for (i = 0; i < LEN(sigs); i++)
if (strcasecmp(sigs[i].name, name) == 0) if (strcasecmp(sigs[i].name, name) == 0)
return sigs[i].sig; return sigs[i].sig;