Merge commit 'meins/master'

[paraslash.git] / signal.c

diff --git a/signal.c b/signal.c
index 84f73fc8a9e373e7abdf6a6d7043f3c1be5e07b3..5d3e2c9d915c5bbc2c92b5197dcee5c4e06b1ba5 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -102,32 +102,17 @@ int para_reap_child(pid_t *pid)
        return 1;
 }
 
-/**
- * Paraslash's zombie killer.
- *
- * It just calls \p para_reap_child() until there are no more children left to
- * reap.
- */
-void para_reap_children(void)
-{
-       pid_t pid;
-
-       while (para_reap_child(&pid) > 0)
-               ; /* nothing */
-}
-
 /**
  * Install the given handler for the given signal.
  *
  * \param sig The number of the signal to catch.
  * \param handler to be installed, \p SIG_IGN, or \p SIG_DFL.
  *
- * \return This function returns 1 on success and \p -E_SIGNAL_SIG_ERR on
- * errors.
+ * This either succeeds or calls exit(EXIT_FAILURE).
  *
  * \sa sigaction(2).
  */
-int para_sigaction(int sig, void (*handler)(int))
+void para_sigaction(int sig, void (*handler)(int))
 {
        struct sigaction act;
 
@@ -144,9 +129,11 @@ int para_sigaction(int sig, void (*handler)(int))
                        act.sa_flags |= SA_RESTART;
                #endif
        }
-       if (sigaction(sig, &act, NULL) < 0)
-               return -E_SIGNAL_SIG_ERR;
-       return 1;
+       if (sigaction(sig, &act, NULL) >= 0)
+               return;
+       PARA_EMERG_LOG("failed to install signal handler for signal %d\n",
+               sig);
+       exit(EXIT_FAILURE);
 }
 
 /**
@@ -154,18 +141,15 @@ int para_sigaction(int sig, void (*handler)(int))
  *
  * \param sig The number of the signal to catch.
  *
- * \return This function returns 1 on success and \p -E_SIGNAL_SIG_ERR on
- * errors.
- *
  * \sa signal(2), sigaction(2).
  */
-int para_install_sighandler(int sig)
+void para_install_sighandler(int sig)
 {
-       return para_sigaction(sig, &generic_signal_handler);
+       para_sigaction(sig, &generic_signal_handler);
 }
 
 /**
- * Return the number of next pending signal.
+ * Return the number of the next pending signal.
  *
  * This should be called if the fd for the signal pipe is ready for reading.
  *