commit: 70d25d97470fc9320966ea8dfb30ff7d9edf486c
parent: c74e56d4050f90a9c7cfb75df873992f67f3a853
author: Matija Skala <mskala@gmx.com>
date: Thu, 26 Mar 2020 23:35:08 +0100
Do not assume signal numbers
2 files changed, 123 insertions(+), 34 deletions(-)
diff --git a/signame.c b/signame.c
@@ -35,40 +35,114 @@
#include <signal.h>
#include <unistd.h>
-const char *const sys_signame[NSIG] = {
- "Signal 0",
- "HUP", /* SIGHUP */
- "INT", /* SIGINT */
- "QUIT", /* SIGQUIT */
- "ILL", /* SIGILL */
- "TRAP", /* SIGTRAP */
- "ABRT", /* SIGABRT */
- "EMT", /* SIGEMT */
- "FPE", /* SIGFPE */
- "KILL", /* SIGKILL */
- "BUS", /* SIGBUS */
- "SEGV", /* SIGSEGV */
- "SYS", /* SIGSYS */
- "PIPE", /* SIGPIPE */
- "ALRM", /* SIGALRM */
- "TERM", /* SIGTERM */
- "URG", /* SIGURG */
- "STOP", /* SIGSTOP */
- "TSTP", /* SIGTSTP */
- "CONT", /* SIGCONT */
- "CHLD", /* SIGCHLD */
- "TTIN", /* SIGTTIN */
- "TTOU", /* SIGTTOU */
- "IO", /* SIGIO */
- "XCPU", /* SIGXCPU */
- "XFSZ", /* SIGXFSZ */
- "VTALRM", /* SIGVTALRM */
- "PROF", /* SIGPROF */
- "WINCH", /* SIGWINCH */
- "INFO", /* SIGINFO */
- "USR1", /* SIGUSR1 */
- "USR2", /* SIGUSR2 */
- "THR", /* SIGTHR */
+static const struct { int sig; const char *name; } signame[] = {
+ { 0, "Signal 0" },
+#ifdef SIGHUP
+ { SIGHUP, "HUP" },
+#endif
+#ifdef SIGINT
+ { SIGINT, "INT" },
+#endif
+#ifdef SIGQUIT
+ { SIGQUIT, "QUIT" },
+#endif
+#ifdef SIGILL
+ { SIGILL, "ILL" },
+#endif
+#ifdef SIGTRAP
+ { SIGTRAP, "TRAP" },
+#endif
+#ifdef SIGABRT
+ { SIGABRT, "ABRT" },
+#endif
+#ifdef SIGEMT
+ { SIGEMT, "EMT" },
+#endif
+#ifdef SIGFPE
+ { SIGFPE, "FPE" },
+#endif
+#ifdef SIGKILL
+ { SIGKILL, "KILL" },
+#endif
+#ifdef SIGBUS
+ { SIGBUS, "BUS" },
+#endif
+#ifdef SIGSEGV
+ { SIGSEGV, "SEGV" },
+#endif
+#ifdef SIGSYS
+ { SIGSYS, "SYS" },
+#endif
+#ifdef SIGPIPE
+ { SIGPIPE, "PIPE" },
+#endif
+#ifdef SIGALRM
+ { SIGALRM, "ALRM" },
+#endif
+#ifdef SIGTERM
+ { SIGTERM, "TERM" },
+#endif
+#ifdef SIGURG
+ { SIGURG, "URG" },
+#endif
+#ifdef SIGSTOP
+ { SIGSTOP, "STOP" },
+#endif
+#ifdef SIGTSTP
+ { SIGTSTP, "TSTP" },
+#endif
+#ifdef SIGCONT
+ { SIGCONT, "CONT" },
+#endif
+#ifdef SIGCHLD
+ { SIGCHLD, "CHLD" },
+#endif
+#ifdef SIGTTIN
+ { SIGTTIN, "TTIN" },
+#endif
+#ifdef SIGTTOU
+ { SIGTTOU, "TTOU" },
+#endif
+#ifdef SIGIO
+ { SIGIO, "IO" },
+#endif
+#ifdef SIGXCPU
+ { SIGXCPU, "XCPU" },
+#endif
+#ifdef SIGXFSZ
+ { SIGXFSZ, "XFSZ" },
+#endif
+#ifdef SIGVTALRM
+ { SIGVTALRM, "VTALRM" },
+#endif
+#ifdef SIGPROF
+ { SIGPROF, "PROF" },
+#endif
+#ifdef SIGWINCH
+ { SIGWINCH, "WINCH" },
+#endif
+#ifdef SIGINFO
+ { SIGINFO, "INFO" },
+#endif
+#ifdef SIGUSR1
+ { SIGUSR1, "USR1" },
+#endif
+#ifdef SIGUSR2
+ { SIGUSR2, "USR2" },
+#endif
+#ifdef SIGPWR
+ { SIGPWR, "PWR" },
+#endif
+#ifdef SIGSTKFLT
+ { SIGSTKFLT, "STKFLT" },
+#endif
};
+const char *sig2str(int sig) {
+ for (int i = 0; i < sizeof(signame)/sizeof(*signame); i++)
+ if (signame[i].sig == sig)
+ return signame[i].name;
+ return "UNKNOWN";
+}
+
#endif /* !HAVE_SIGNAME */
diff --git a/trap.c b/trap.c
@@ -15,6 +15,10 @@ Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign, Sigact_trap;
+#ifndef HAVE_SIGNAME
+const char *sig2str(int sig);
+#endif
+
void
inittraps(void)
{
@@ -27,8 +31,19 @@ inittraps(void)
sigtraps[i].name = "ERR";
sigtraps[i].mess = "Error handler";
} else {
+#ifdef HAVE_SIGNAME
sigtraps[i].name = sys_signame[i];
+#else
+ sigtraps[i].name = sig2str(i);
+#endif
+#ifdef HAVE_SIGLIST
sigtraps[i].mess = sys_siglist[i];
+#else
+ static char *mess[NSIG+1] = {NULL};
+ if (!mess[i])
+ mess[i] = strdup(strsignal(i));
+ sigtraps[i].mess = mess[i];
+#endif
}
}
sigtraps[SIGEXIT_].name = "EXIT"; /* our name for signal 0 */
