lib/signames: remove signame array from header file
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak
parent
c5910c7f27
commit
c61e986fd0
|
|
@ -1,132 +1,9 @@
|
|||
#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(const char *sig);
|
||||
const char *signum_to_signame(int signum);
|
||||
size_t get_numof_signames(void);
|
||||
int get_signame_by_idx(size_t idx, const char **signame, int *signum);
|
||||
|
||||
#endif /* SIGNAMES_H */
|
||||
|
|
|
|||
116
lib/signames.c
116
lib/signames.c
|
|
@ -40,7 +40,6 @@
|
|||
*/
|
||||
|
||||
#include <ctype.h> /* for isdigit() */
|
||||
#include <signames.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
|
@ -48,7 +47,90 @@
|
|||
|
||||
#include "c.h"
|
||||
#include "strutils.h"
|
||||
#include "signames.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
|
||||
};
|
||||
|
||||
#ifdef SIGRTMIN
|
||||
static int rtsig_to_signum(const char *sig)
|
||||
|
|
@ -93,3 +175,35 @@ int signame_to_signum(const char *sig)
|
|||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
const char *signum_to_signame(int signum)
|
||||
{
|
||||
size_t n;
|
||||
|
||||
for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
|
||||
if (sys_signame[n].val == signum) {
|
||||
return sys_signame[n].name;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size_t get_numof_signames(void)
|
||||
{
|
||||
return ARRAY_SIZE(sys_signame);
|
||||
}
|
||||
|
||||
int get_signame_by_idx(size_t idx, const char **signame, int *signum)
|
||||
{
|
||||
if (idx >= ARRAY_SIZE(sys_signame))
|
||||
return -1;
|
||||
|
||||
if (signame)
|
||||
*signame = sys_signame[idx].name;
|
||||
if (signum)
|
||||
*signum = sys_signame[idx].val;
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,13 +85,11 @@ struct kill_control {
|
|||
|
||||
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) {
|
||||
|
|
@ -116,17 +114,19 @@ static void pretty_print_signal(FILE *fp, size_t term_width, size_t *lpos,
|
|||
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);
|
||||
|
|
@ -137,9 +137,8 @@ static void print_all_signals(FILE *fp, int pretty)
|
|||
|
||||
/* pretty print */
|
||||
width = get_terminal_width(KILL_OUTPUT_WIDTH + 1) - 1;
|
||||
for (n = 0; n < ARRAY_SIZE(sys_signame); n++)
|
||||
pretty_print_signal(fp, width, &lpos,
|
||||
sys_signame[n].val, sys_signame[n].name);
|
||||
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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue