mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdm: when logging signal related errors, include the signal name

Browse source 
Since sigabbrev_np() is GNU only, provide a fallback function that
returns "SIG<signo>" when sigabbrev_np() doesn't exist (for example,
on FreeBSD).
This commit is contained in:
Daniel Eklöf 2025-07-21 15:28:52 +02:00
parent 7ab43ebf74
commit 21db6a6cdc
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
fdm.c
View file

@ -18,6 +18,18 @@
#include "debug.h" #include "debug.h"
#include "xmalloc.h" #include "xmalloc.h"
#if !defined(SIGABBREV_NP)
#include <stdio.h>
static const char *
sigabbrev_np(int sig)
{
static char buf[16];
snprintf(buf, sizeof(buf), "<%d>", sig);
return buf;
}
#endif
struct fd_handler { struct fd_handler {
int fd; int fd;
int events; int events;
@ -113,7 +125,8 @@ fdm_destroy(struct fdm *fdm)
for (int i = 0; i < SIGRTMAX; i++) { for (int i = 0; i < SIGRTMAX; i++) {
if (fdm->signal_handlers[i].callback != NULL) if (fdm->signal_handlers[i].callback != NULL)
LOG_WARN("handler for signal %d not removed", i); LOG_WARN("handler for signal %d (SIG%s) not removed",
i, sigabbrev_np(i));
} }
if (tll_length(fdm->hooks_low) > 0 || if (tll_length(fdm->hooks_low) > 0 ||
@ -338,7 +351,8 @@ bool
fdm_signal_add(struct fdm *fdm, int signo, fdm_signal_handler_t handler, void *data) fdm_signal_add(struct fdm *fdm, int signo, fdm_signal_handler_t handler, void *data)
{ {
if (fdm->signal_handlers[signo].callback != NULL) { if (fdm->signal_handlers[signo].callback != NULL) {
LOG_ERR("signal %d already has a handler", signo); LOG_ERR("signal %d (SIG%s) already has a handler",
signo, sigabbrev_np(signo));
return false; return false;
} }
@ -347,14 +361,16 @@ fdm_signal_add(struct fdm *fdm, int signo, fdm_signal_handler_t handler, void *d
sigaddset(&mask, signo); sigaddset(&mask, signo);
if (sigprocmask(SIG_BLOCK, &mask, &original) < 0) { if (sigprocmask(SIG_BLOCK, &mask, &original) < 0) {
LOG_ERRNO("failed to block signal %d", signo); LOG_ERRNO("failed to block signal %d (SIG%s)",
signo, sigabbrev_np(signo));
return false; return false;
} }
struct sigaction action = {.sa_handler = &signal_handler}; struct sigaction action = {.sa_handler = &signal_handler};
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);
if (sigaction(signo, &action, NULL) < 0) { if (sigaction(signo, &action, NULL) < 0) {
LOG_ERRNO("failed to set signal handler for signal %d", signo); LOG_ERRNO("failed to set signal handler for signal %d (SIG%s)",
signo, sigabbrev_np(signo));
sigprocmask(SIG_SETMASK, &original, NULL); sigprocmask(SIG_SETMASK, &original, NULL);
return false; return false;
} }
@ -374,7 +390,8 @@ fdm_signal_del(struct fdm *fdm, int signo)
struct sigaction action = {.sa_handler = SIG_DFL}; struct sigaction action = {.sa_handler = SIG_DFL};
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);
if (sigaction(signo, &action, NULL) < 0) { if (sigaction(signo, &action, NULL) < 0) {
LOG_ERRNO("failed to restore signal handler for signal %d", signo); LOG_ERRNO("failed to restore signal handler for signal %d (SIG%s)",
signo, sigabbrev_np(signo));
return false; return false;
} }
@ -386,7 +403,8 @@ fdm_signal_del(struct fdm *fdm, int signo)
sigemptyset(&mask); sigemptyset(&mask);
sigaddset(&mask, signo); sigaddset(&mask, signo);
if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) { if (sigprocmask(SIG_UNBLOCK, &mask, NULL) < 0) {
LOG_ERRNO("failed to unblock signal %d", signo); LOG_ERRNO("failed to unblock signal %d (SIG%s)",
signo, sigabbrev_np(signo));
return false; return false;
} }

6
meson.build
View file

@ -25,6 +25,12 @@ if cc.has_function('execvpe',
add_project_arguments('-DEXECVPE', language: 'c') add_project_arguments('-DEXECVPE', language: 'c')
endif endif
if cc.has_function('sigabbrev_np',
args: ['-D_GNU_SOURCE'],
prefix: '#include <string.h>')
add_project_arguments('-DSIGABBREV_NP', language: 'c')
endif
utmp_backend = get_option('utmp-backend') utmp_backend = get_option('utmp-backend')
if utmp_backend == 'auto' if utmp_backend == 'auto'
host_os = host_machine.system() host_os = host_machine.system()