Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill: cleanup

Browse Source
This commit is contained in:
K. Lange 2018-10-08 10:23:26 +09:00
parent 9c30e8263d
commit c1c5e7ccf4
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/kill.c
View File

@ -12,6 +12,8 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#include <ctype.h>
#include <errno.h>
struct sig_def {
int sig;
@ -73,13 +75,13 @@ void usage(char * argv[]) {
int main(int argc, char * argv[]) {
int signum = SIGKILL;
int pid = 0;
int i = 1;
if (argc < 2) {
usage(argv);
return 1;
}
if (argc > 2) {
if (argv[1][0] == '-') {
signum = -1;
if (strlen(argv[1]+1) > 3 && strstr(argv[1]+1,"SIG") == (argv[1]+1)) {
@ -92,7 +94,7 @@ int main(int argc, char * argv[]) {
s++;
}
} else {
if (argv[1][1] < '0' || argv[1][1] > '9') {
if (!isdigit(argv[1][1] < '0')) {
struct sig_def * s = signals;
while (s->name) {
if (!strcmp(argv[1]+1,s->name)) {
@ -109,18 +111,22 @@ int main(int argc, char * argv[]) {
fprintf(stderr,"%s: %s: invalid signal specification\n",argv[0],argv[1]+1);
return 1;
}
i++;
}
if (i < argc) {
pid = atoi(argv[i]);
if (pid) {
if (kill(pid, signum) < 0) {
fprintf(stderr, "%s: kill: %s\n", argv[0], strerror(errno));
}
} else {
fprintf(stderr, "%s: invalid pid\n", argv[0]);
}
} else {
usage(argv);
return 1;
}
pid = atoi(argv[2]);
} else if (argc == 2) {
pid = atoi(argv[1]);
}
if (pid) {
kill(pid, signum);
}
return 0;
}