NEWS update.

[paraslash.git] / signal.c

diff --git a/signal.c b/signal.c
index 9a1dcfb0ac5f4ef240e627e80a26ee0379c94519..5d3e2c9d915c5bbc2c92b5197dcee5c4e06b1ba5 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -103,34 +103,21 @@ int para_reap_child(pid_t *pid)
 }
 
 /**
 }
 
 /**

- * 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 generic signal handler for the given signal number.
+ * Install the given handler for the given signal.

  *
  * \param sig The number of the signal to catch.
  *
  * \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 signal(2), sigaction(2).
+ * \sa sigaction(2).

  */
  */

-int para_install_sighandler(int sig)
+void para_sigaction(int sig, void (*handler)(int))

 {
        struct sigaction act;
 
        PARA_DEBUG_LOG("catching signal %d\n", sig);
 {
        struct sigaction act;
 
        PARA_DEBUG_LOG("catching signal %d\n", sig);

-       act.sa_handler = &generic_signal_handler;
+       act.sa_handler = handler;

        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
        if (sig == SIGALRM) {
        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
        if (sig == SIGALRM) {


@@ -142,13 +129,27 @@ int para_install_sighandler(int sig)
                        act.sa_flags |= SA_RESTART;
                #endif
        }
                        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);
+}
+
+/**
+ * Install the generic signal handler for the given signal number.
+ *
+ * \param sig The number of the signal to catch.
+ *
+ * \sa signal(2), sigaction(2).
+ */
+void para_install_sighandler(int sig)
+{
+       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.
  *
  *
  * This should be called if the fd for the signal pipe is ready for reading.
  *