personal/pomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace signal(2) with sigaction(2) for portability

Browse Source 
It also require defining _POSIX_C_SOURCE constant to 1 (see config.mk).

Depending on wether you only want to rely on C99 standard or POSIX 1.
This commit is contained in:
Simon Lieb 2016-10-22 20:06:23 +02:00 committed by Ivan Tham
parent 22f35d5af4
commit 50ed6952f2
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spt.c
View File

@ -81,9 +81,9 @@ void
remaining_time(int sigint) remaining_time(int sigint)
{ {
char buf[17]; char buf[17];
if (signal(SIGUSR1, SIG_IGN) != SIG_IGN)
signal(SIGUSR1, remaining_time);
// FIXME: signal handlers should only do very few things, like
// setting volatile sig_atomic_t
snprintf(buf, 17, "Remaining: %02d:%02d\n", snprintf(buf, 17, "Remaining: %02d:%02d\n",
(timers[i].tmr - timecount) / 60, (timers[i].tmr - timecount) / 60,
(timers[i].tmr - timecount) % 60); (timers[i].tmr - timecount) % 60);
@ -93,9 +93,6 @@ remaining_time(int sigint)
void void
toggle(int sigint) { toggle(int sigint) {
if (signal(SIGUSR2, SIG_IGN) != SIG_IGN)
signal(SIGUSR2, toggle);
suspend ^= 1; suspend ^= 1;
} }
@ -108,8 +105,8 @@ usage(void)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
sigset_t *emptymask = 0; struct sigaction sa;
suspend = 0; sigset_t emptymask;
ARGBEGIN { ARGBEGIN {
case 'e': case 'e':
@ -126,17 +123,28 @@ main(int argc, char *argv[])
break; break;
} ARGEND; } ARGEND;
if (signal(SIGUSR1, SIG_IGN) != SIG_IGN) /* add SIGUSR1 handler: remaining_time */
signal(SIGUSR1, remaining_time); sa.sa_handler = remaining_time;
if (signal(SIGUSR2, SIG_IGN) != SIG_IGN) sigemptyset(&sa.sa_mask);
signal(SIGUSR2, toggle); sa.sa_flags = 0;
if (sigaction(SIGUSR1, &sa, NULL) == -1)
die("cannot associate SIGUSR1 to handler\n");
/* add SIGUSR2 handler: toggle */
sa.sa_handler = toggle;
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
if (sigaction(SIGUSR2, &sa, NULL) == -1)
die("cannot associate SIGUSR2 to handler\n");
for (i = 0; ; i = (i + 1) % LEN(timers)) { for (i = 0; ; i = (i + 1) % LEN(timers)) {
notify_send(timers[i].cmt); notify_send(timers[i].cmt);
timecount = 0; timecount = 0;
while (timecount < timers[i].tmr) while (timecount < timers[i].tmr)
if (suspend) if (suspend)
sigsuspend(emptymask); sigsuspend(&emptymask);
else { else {
sleep(1); sleep(1);
timecount++; timecount++;