* 1999-02-22 Arkadiusz Miśkiewicz <misiek@pld.ORG.PL>
* - added Native Language Support
*
- * 1999-11-13 aeb Accept signal numers 128+s.
+ * 1999-11-13 aeb Accept signal numbers 128+s.
*
* Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
* Copyright (C) 2014 Karel Zak <kzak@redhat.com>
#include "closestream.h"
#include "nls.h"
#include "procutils.h"
+#include "signames.h"
#include "strutils.h"
#include "ttyutils.h"
#include "xalloc.h"
check_all:1,
do_kill:1,
do_pid:1,
- use_sigval:1;
-};
-
-struct signv {
- const char *name;
- int val;
-} sys_signame[] = {
- /* POSIX signals */
- { "HUP", SIGHUP }, /* 1 */
- { "INT", SIGINT }, /* 2 */
- { "QUIT", SIGQUIT }, /* 3 */
- { "ILL", SIGILL }, /* 4 */
-#ifdef SIGTRAP
- { "TRAP", SIGTRAP }, /* 5 */
-#endif
- { "ABRT", SIGABRT }, /* 6 */
-#ifdef SIGIOT
- { "IOT", SIGIOT }, /* 6, same as SIGABRT */
-#endif
-#ifdef SIGEMT
- { "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */
-#endif
-#ifdef SIGBUS
- { "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */
-#endif
- { "FPE", SIGFPE }, /* 8 */
- { "KILL", SIGKILL }, /* 9 */
- { "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */
- { "SEGV", SIGSEGV }, /* 11 */
- { "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */
- { "PIPE", SIGPIPE }, /* 13 */
- { "ALRM", SIGALRM }, /* 14 */
- { "TERM", SIGTERM }, /* 15 */
-#ifdef SIGSTKFLT
- { "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */
-#endif
- { "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */
-#ifdef SIGCLD
- { "CLD", SIGCLD }, /* same as SIGCHLD (mips) */
-#endif
- { "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */
- { "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */
- { "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */
- { "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */
- { "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */
-#ifdef SIGURG
- { "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */
-#endif
-#ifdef SIGXCPU
- { "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */
-#endif
-#ifdef SIGXFSZ
- { "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */
-#endif
-#ifdef SIGVTALRM
- { "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */
-#endif
-#ifdef SIGPROF
- { "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */
-#endif
-#ifdef SIGWINCH
- { "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */
-#endif
-#ifdef SIGIO
- { "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */
-#endif
-#ifdef SIGPOLL
- { "POLL", SIGPOLL }, /* same as SIGIO */
-#endif
-#ifdef SIGINFO
- { "INFO", SIGINFO }, /* 29 (alpha) */
-#endif
-#ifdef SIGLOST
- { "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */
-#endif
-#ifdef SIGPWR
- { "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */
-#endif
-#ifdef SIGUNUSED
- { "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */
-#endif
-#ifdef SIGSYS
- { "SYS", SIGSYS }, /* 31 (mips,alpha,sparc*) */
-#endif
+ use_sigval:1,
+ verbose:1;
};
static void print_signal_name(int signum)
{
- size_t n;
+ const char *name = signum_to_signame(signum);
- for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
- if (sys_signame[n].val == signum) {
- printf("%s\n", sys_signame[n].name);
- return;
- }
+ if (name) {
+ printf("%s\n", name);
+ return;
}
#ifdef SIGRTMIN
if (SIGRTMIN <= signum && signum <= SIGRTMAX) {
static void print_all_signals(FILE *fp, int pretty)
{
size_t n, lth, lpos = 0, width;
+ const char *signame = NULL;
+ int signum = 0;
if (!pretty) {
- for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
- lth = 1 + strlen(sys_signame[n].name);
+ for (n = 0; get_signame_by_idx(n, &signame, NULL) == 0; n++) {
+ lth = 1 + strlen(signame);
if (KILL_OUTPUT_WIDTH < lpos + lth) {
fputc('\n', fp);
lpos = 0;
} else if (lpos)
fputc(' ', fp);
lpos += lth;
- fputs(sys_signame[n].name, fp);
+ fputs(signame, fp);
}
#ifdef SIGRTMIN
fputs(" RT<N> RTMIN+<N> RTMAX-<N>", fp);
}
/* pretty print */
- width = get_terminal_width();
- if (width == 0)
- width = KILL_OUTPUT_WIDTH;
- else
- width -= 1;
- for (n = 0; n < ARRAY_SIZE(sys_signame); n++)
- pretty_print_signal(fp, width, &lpos,
- sys_signame[n].val, sys_signame[n].name);
+ width = get_terminal_width(KILL_OUTPUT_WIDTH + 1) - 1;
+ for (n = 0; get_signame_by_idx(n, &signame, &signum) == 0; n++)
+ pretty_print_signal(fp, width, &lpos, signum, signame);
#ifdef SIGRTMIN
pretty_print_signal(fp, width, &lpos, SIGRTMIN, "RTMIN");
pretty_print_signal(fp, width, &lpos, SIGRTMAX, "RTMAX");
exit(EXIT_FAILURE);
}
-#ifdef SIGRTMIN
-static int rtsig_to_signum(char *sig)
-{
- int num, maxi = 0;
- char *ep = NULL;
-
- if (strncasecmp(sig, "min+", 4) == 0)
- sig += 4;
- else if (strncasecmp(sig, "max-", 4) == 0) {
- sig += 4;
- maxi = 1;
- }
- if (!isdigit(*sig))
- return -1;
- errno = 0;
- num = strtol(sig, &ep, 10);
- if (!ep || sig == ep || errno || num < 0)
- return -1;
- num = maxi ? SIGRTMAX - num : SIGRTMIN + num;
- if (num < SIGRTMIN || SIGRTMAX < num)
- return -1;
- return num;
-}
-#endif
-
-static int signame_to_signum(char *sig)
-{
- size_t n;
-
- if (!strncasecmp(sig, "sig", 3))
- sig += 3;
-#ifdef SIGRTMIN
- /* RT signals */
- if (!strncasecmp(sig, "rt", 2))
- return rtsig_to_signum(sig + 2);
-#endif
- /* Normal sugnals */
- for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
- if (!strcasecmp(sys_signame[n].name, sig))
- return sys_signame[n].val;
- }
- return -1;
-}
-
static int arg_to_signum(char *arg, int maskbit)
{
int numsig;
return signame_to_signum(arg);
}
-static void __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(void)
{
+ FILE *out = stdout;
fputs(USAGE_HEADER, out);
- fprintf(out, _(" %s [options] <pid|name> [...]\n"), program_invocation_short_name);
+ fprintf(out, _(" %s [options] <pid>|<name>...\n"), program_invocation_short_name);
+
+ fputs(USAGE_SEPARATOR, out);
+ fputs(_("Forcibly terminate a process.\n"), out);
fputs(USAGE_OPTIONS, out);
fputs(_(" -a, --all do not restrict the name-to-pid conversion to processes\n"
- " with the same uid as the present process\n"), out);
- fputs(_(" -s, --signal <sig> send specified signal\n"), out);
+ " with the same uid as the present process\n"), out);
+ fputs(_(" -s, --signal <signal> send this <signal> instead of SIGTERM\n"), out);
#ifdef HAVE_SIGQUEUE
- fputs(_(" -q, --queue <sig> use sigqueue(2) rather than kill(2)\n"), out);
+ fputs(_(" -q, --queue <value> use sigqueue(2), not kill(2), and pass <value> as data\n"), out);
#endif
fputs(_(" -p, --pid print pids without signaling them\n"), out);
- fputs(_(" -l, --list [=<signal>] list signal names, or convert one to a name\n"), out);
+ fputs(_(" -l, --list[=<signal>] list signal names, or convert a signal number to a name\n"), out);
fputs(_(" -L, --table list signal names and numbers\n"), out);
+ fputs(_(" --verbose print pids that will be signaled\n"), out);
fputs(USAGE_SEPARATOR, out);
- fputs(USAGE_HELP, out);
- fputs(USAGE_VERSION, out);
- fprintf(out, USAGE_MAN_TAIL("kill(1)"));
+ printf(USAGE_HELP_OPTIONS(24));
+ printf(USAGE_MAN_TAIL("kill(1)"));
- exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}
static char **parse_arguments(int argc, char **argv, struct kill_control *ctl)
exit(EXIT_SUCCESS);
}
if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
- usage(stdout);
-
+ usage();
+ if (!strcmp(arg, "--verbose")) {
+ ctl->verbose = 1;
+ continue;
+ }
if (!strcmp(arg, "-a") || !strcmp(arg, "--all")) {
ctl->check_all = 1;
continue;
errx(EXIT_FAILURE, _("%s and %s are mutually exclusive"), "--pid", "--queue");
argc--, argv++;
arg = *argv;
- if ((ctl->numsig = arg_to_signum(arg, 0)) < 0)
- err_nosig(arg);
- ctl->sigdata.sival_int = ctl->numsig;
+ ctl->sigdata.sival_int = strtos32_or_err(arg, _("argument error"));
ctl->use_sigval = 1;
continue;
}
* So it's probably something like -HUP, or -1/-n try to
* deal with it.
*
- * -n could be signal n, or pid -n (i.e., process group
- * number). In case of doubt POSIX tells us to assume a
- * signal. If a signal has been parsed, assume it is a
- * pid, break. */
+ * -n could be either signal n or pid -n (a process group
+ * number). In case of doubt, POSIX tells us to assume a
+ * signal. But if a signal has already been parsed, then
+ * assume it is a process group, so stop parsing options. */
if (ctl->do_kill)
break;
arg++;
if ((ctl->numsig = arg_to_signum(arg, 0)) < 0)
- errx(EXIT_FAILURE, _("invalid sigval argument"));
+ errx(EXIT_FAILURE, _("invalid signal name or number: %s"), arg);
ctl->do_kill = 1;
if (ctl->do_pid)
errx(EXIT_FAILURE, _("%s and %s are mutually exclusive"), "--pid", "--signal");
{
int rc = 0;
+ if (ctl->verbose)
+ printf(_("sending signal %d to pid %d\n"), ctl->numsig, ctl->pid);
if (ctl->do_pid) {
printf("%ld\n", (long) ctl->pid);
return 0;
textdomain(PACKAGE);
atexit(close_stdout);
- ctl.do_pid = (!strcmp(program_invocation_short_name, "pid")); /* Yecch */
- if (ctl.do_pid) /* FIXME: remove in March 2016. */
- warnx(_("use of 'kill --pid' option as command name is deprecated"));
-
argv = parse_arguments(argc, argv, &ctl);
/* The rest of the arguments should be process ids and names. */
if (!found) {
nerrs++, ct++;
- warnx(_("cannot find process \"%s\"."), ctl.arg);
+ warnx(_("cannot find process \"%s\""), ctl.arg);
}
}
}
projects / thirdparty / util-linux.git / blobdiff