nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use fprintf not g_message in the signal handler. no mallocing allowed.

Browse source
This commit is contained in:
Dana Jansens 2003-06-28 19:28:46 +00:00
parent 121afb76eb
commit 1ff042579e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
openbox/openbox.c
View file

@ -26,6 +26,7 @@
# include <fcntl.h> # include <fcntl.h>
#endif #endif
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#define __USE_UNIX98
# include <signal.h> # include <signal.h>
#endif #endif
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -108,10 +109,10 @@ int main(int argc, char **argv)
sigemptyset(&sigset); sigemptyset(&sigset);
action.sa_handler = dispatch_signal; action.sa_handler = dispatch_signal;
action.sa_mask = sigset; action.sa_mask = sigset;
action.sa_flags = SA_NOCLDSTOP; action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
sigaction(SIGUSR1, &action, (struct sigaction *) NULL); sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
sigaction(SIGPIPE, &action, (struct sigaction *) NULL); sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
sigaction(SIGSEGV, &action, (struct sigaction *) NULL); /* sigaction(SIGSEGV, &action, (struct sigaction *) NULL);*/
sigaction(SIGFPE, &action, (struct sigaction *) NULL); sigaction(SIGFPE, &action, (struct sigaction *) NULL);
sigaction(SIGTERM, &action, (struct sigaction *) NULL); sigaction(SIGTERM, &action, (struct sigaction *) NULL);
sigaction(SIGINT, &action, (struct sigaction *) NULL); sigaction(SIGINT, &action, (struct sigaction *) NULL);
@ -442,7 +443,7 @@ static void signal_handler(const ObEvent *e, void *data)
s = e->data.s.signal; s = e->data.s.signal;
switch (s) { switch (s) {
case SIGUSR1: case SIGUSR1:
g_message("Caught SIGUSR1 signal. Restarting."); fprintf(stderr, "Caught SIGUSR1 signal. Restarting.");
ob_shutdown = ob_restart = TRUE; ob_shutdown = ob_restart = TRUE;
break; break;
@ -450,13 +451,13 @@ static void signal_handler(const ObEvent *e, void *data)
case SIGINT: case SIGINT:
case SIGTERM: case SIGTERM:
case SIGPIPE: case SIGPIPE:
g_message("Caught signal %d. Exiting.", s); fprintf(stderr, "Caught signal %d. Exiting.", s);
ob_shutdown = TRUE; ob_shutdown = TRUE;
break; break;
case SIGFPE: case SIGFPE:
case SIGSEGV: case SIGSEGV:
g_message("Caught signal %d. Aborting and dumping core.", s); fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s);
abort(); abort();
} }
} }