kill: Extract signal names into signames.h/signames.c
This commit is contained in:
parent
dec4fae21b
commit
6855f6e80b
|
@ -47,6 +47,7 @@ dist_noinst_HEADERS += \
|
|||
include/randutils.h \
|
||||
include/rpmatch.h \
|
||||
include/sha1.h \
|
||||
include/signames.h \
|
||||
include/setproctitle.h \
|
||||
include/statfs_magic.h \
|
||||
include/strutils.h \
|
||||
|
|
|
@ -0,0 +1,132 @@
|
|||
#ifndef SIGNAMES_H
|
||||
#define SIGNAMES_H
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1993, 1994, 2017
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
/*
|
||||
* 2017-10-14 Niklas Hambüchen <mail@nh2.me>
|
||||
* - Extracted signal names mapping from kill.c
|
||||
*
|
||||
* Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
|
||||
* Copyright (C) 2014 Karel Zak <kzak@redhat.com>
|
||||
* Copyright (C) 2017 Niklas Hambüchen <mail@nh2.me>
|
||||
*/
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
static const 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
|
||||
};
|
||||
|
||||
int signame_to_signum(char *sig);
|
||||
|
||||
#endif /* SIGNAMES_H */
|
|
@ -26,7 +26,8 @@ libcommon_la_SOURCES = \
|
|||
lib/ttyutils.c \
|
||||
lib/exec_shell.c \
|
||||
lib/strv.c \
|
||||
lib/sha1.c
|
||||
lib/sha1.c \
|
||||
lib/signames.c
|
||||
|
||||
if LINUX
|
||||
libcommon_la_SOURCES += \
|
||||
|
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
* Copyright (c) 1988, 1993, 1994, 2017
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
/*
|
||||
* 2017-10-14 Niklas Hambüchen <mail@nh2.me>
|
||||
* - Extracted signal names mapping from kill.c
|
||||
*
|
||||
* Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
|
||||
* Copyright (C) 2014 Karel Zak <kzak@redhat.com>
|
||||
* Copyright (C) 2017 Niklas Hambüchen <mail@nh2.me>
|
||||
*/
|
||||
|
||||
#include <ctype.h> /* for isdigit() */
|
||||
#include <signames.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "c.h"
|
||||
#include "strutils.h"
|
||||
|
||||
|
||||
#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
|
||||
|
||||
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 signals */
|
||||
for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
|
||||
if (!strcasecmp(sys_signame[n].name, sig))
|
||||
return sys_signame[n].val;
|
||||
}
|
||||
return -1;
|
||||
}
|
|
@ -55,6 +55,7 @@
|
|||
#include "closestream.h"
|
||||
#include "nls.h"
|
||||
#include "procutils.h"
|
||||
#include "signames.h"
|
||||
#include "strutils.h"
|
||||
#include "ttyutils.h"
|
||||
#include "xalloc.h"
|
||||
|
@ -82,89 +83,6 @@ struct kill_control {
|
|||
verbose:1;
|
||||
};
|
||||
|
||||
static const 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
|
||||
};
|
||||
|
||||
static void print_signal_name(int signum)
|
||||
{
|
||||
size_t n;
|
||||
|
@ -236,50 +154,6 @@ static void err_nosig(char *name)
|
|||
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 signals */
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue