X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=5d3e2c9d915c5bbc2c92b5197dcee5c4e06b1ba5;hp=9168e918205a5f6733761db31ea7fc6573b2bbae;hb=5967b31f0e4163a9be4ed5aeb01bd2c6377ffac8;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07;ds=sidebyside

diff --git a/signal.c b/signal.c
index 9168e918..5d3e2c9d 100644
--- a/signal.c
+++ b/signal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -103,38 +103,53 @@ 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);
 }
 
 /**
- * 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.
  *