X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=da395157c29ae8aff0459a2731e10ae7a13e90e6;hp=acc87802b33a841f8f5d7f90b971ae97a3edc3b0;hb=c36f5e92c572c8eaf77c227bce164b9e98a74a3e;hpb=002731cd3938f3be6b71651e56c062af1adcdec0

diff --git a/signal.c b/signal.c
index acc87802..da395157 100644
--- a/signal.c
+++ b/signal.c
@@ -103,34 +103,49 @@ int para_reap_child(pid_t *pid)
 }
 
 /**
- * Paraslash's zombie killer.
+ * Install the given handler for the given signal.
  *
- * It just calls \p para_reap_child() until there are no more children left to
- * reap.
+ * \param sig The number of the signal to catch.
+ * \param handler to be installed, \p SIG_IGN, or \p SIG_DFL.
+ *
+ * This either succeeds or calls exit(EXIT_FAILURE).
+ *
+ * \sa sigaction(2).
  */
-void para_reap_children(void)
+void para_sigaction(int sig, void (*handler)(int))
 {
-	pid_t pid;
+	struct sigaction act;
 
-	while (para_reap_child(&pid) > 0)
-		; /* nothing */
+	PARA_DEBUG_LOG("catching signal %d\n", sig);
+	act.sa_handler = handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	if (sig == SIGALRM) {
+		#ifdef SA_INTERRUPT /* SunOS */
+			act.sa_flags |= SA_INTERRUPT;
+		#endif
+	} else {
+		#ifdef SA_RESTART /* BSD */
+			act.sa_flags |= SA_RESTART;
+		#endif
+	}
+	if (sigaction(sig, &act, NULL) >= 0)
+		return;
+	PARA_EMERG_LOG("failed to install signal handler for signal %d\n",
+		sig);
+	exit(EXIT_FAILURE);
 }
 
 /**
- * Wrapper around signal(2).
+ * Install the generic signal handler for the given signal number.
  *
  * \param sig The number of the signal to catch.
  *
- * This installs the generic signal handler for the given signal.
- *
- * \return This function returns 1 on success and \p -E_SIGNAL_SIG_ERR on errors.
- *
- * \sa signal(2).
+ * \sa signal(2), sigaction(2).
  */
-int para_install_sighandler(int sig)
+void para_install_sighandler(int sig)
 {
-	PARA_DEBUG_LOG("catching signal %d\n", sig);
-	return signal(sig, &generic_signal_handler) == SIG_ERR?  -E_SIGNAL_SIG_ERR : 1;
+	para_sigaction(sig, &generic_signal_handler);
 }
 
 /**