fixed signal handler at door_daemon and powersensordaemon

[svn42.git] / door_daemon / sig_handler.c

diff --git a/door_daemon/sig_handler.c b/door_daemon/sig_handler.c
index 8be2de3..2a17ebe 100644 (file)
--- a/door_daemon/sig_handler.c
+++ b/door_daemon/sig_handler.c
@@ -82,17 +82,21 @@ int signal_init()
     }
   }
 
-  struct sigaction act;
+  struct sigaction act, act_ign;
   act.sa_handler = sig_handler;
   sigfillset(&act.sa_mask);
   act.sa_flags = 0;
+  act_ign.sa_handler = SIG_IGN;
+  sigfillset(&act_ign.sa_mask);
+  act_ign.sa_flags = 0;
 
   if((sigaction(SIGINT, &act, NULL) < 0) ||
      (sigaction(SIGQUIT, &act, NULL) < 0) ||
      (sigaction(SIGTERM, &act, NULL) < 0) ||
      (sigaction(SIGHUP, &act, NULL) < 0) ||
      (sigaction(SIGUSR1, &act, NULL) < 0) ||
-     (sigaction(SIGUSR2, &act, NULL) < 0)) {
+     (sigaction(SIGUSR2, &act, NULL) < 0) ||
+     (sigaction(SIGPIPE, &act_ign, NULL) < 0)) {
 
     log_printf(ERROR, "signal handling init failed (sigaction error: %s)", strerror(errno));
     close(sig_pipe_fds[0]);
@@ -121,7 +125,7 @@ int signal_handle()
 
   int return_value = 0;
   int sig;
-  for(sig=1; sig < _NSIG; ++sig) {
+  for(sig=1; sig < NSIG; ++sig) {
     if(sigismember(&set, sig)) {
       switch(sig) {
       case SIGINT: log_printf(NOTICE, "SIG-Int caught, exitting"); return_value = 1; break;
@@ -153,6 +157,7 @@ void signal_stop()
   sigaction(SIGHUP, &act, NULL);
   sigaction(SIGUSR1, &act, NULL);
   sigaction(SIGUSR2, &act, NULL);
+  sigaction(SIGPIPE, &act, NULL);
 
   close(sig_pipe_fds[0]);
   close(sig_pipe_fds[1]);