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

kill -l accepts at most 1 arg

This commit is contained in:
sin 2014-11-11 16:08:13 +00:00
parent aee8535a71
commit a81544a810
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kill.1
View File

@ -4,7 +4,7 @@ KILL \- signal processes
.SH SYNOPSIS .SH SYNOPSIS
\fBkill\fR [ \fB-s\fR \fIsignal_name\fR ] \fIpid\fR \fI...\fR \fBkill\fR [ \fB-s\fR \fIsignal_name\fR ] \fIpid\fR \fI...\fR
.P .P
\fBkill\fR \fB-l\fR [ \fIexit_status\fR \fI...\fR] \fBkill\fR \fB-l\fR [ \fIexit_status\fR]
.P .P
\fBkill\fR \fB-\fR\fIsignal_name\fR \fIpid\fR \fI...\fR \fBkill\fR \fB-\fR\fIsignal_name\fR \fIpid\fR \fI...\fR
.P .P

27
kill.c
View File

@ -28,7 +28,7 @@ static void
usage(void) usage(void)
{ {
weprintf("usage: %s [-s signame | -signum | -signame] pid ...\n", argv0); weprintf("usage: %s [-s signame | -signum | -signame] pid ...\n", argv0);
weprintf(" %s -l [exit_status ...]\n", argv0); weprintf(" %s -l [exit_status]\n", argv0);
exit(1); exit(1);
} }
@ -72,19 +72,16 @@ main(int argc, char *argv[])
puts(sigs[i].name); puts(sigs[i].name);
exit(0); exit(0);
} }
for (; argc; argc--, argv++) { errno = 0;
errno = 0; sig = strtol(argv[0], &end, 0);
sig = strtol(argv[0], &end, 0); if (*end == '\0' && errno == 0) {
if (*end == '\0' && errno == 0) { name = sig2name(sig);
name = sig2name(sig); if (!name)
if (!name) eprintf("%d: bad signal number\n", sig);
printf("%d\n", sig); else
else puts(name);
puts(name); } else {
} else { eprintf("%s: bad signal name\n", argv[0]);
weprintf("%s: bad signal number\n", argv[0]);
ret = 1;
}
} }
exit(0); exit(0);
} else { } else {
@ -108,7 +105,7 @@ main(int argc, char *argv[])
} }
} }
if (i == LEN(sigs)) if (i == LEN(sigs))
eprintf("%s: bad signal number\n", name); eprintf("%s: bad signal name\n", name);
} }
argc--; argc--;
argv++; argv++;