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

diff --git a/signal.c b/signal.c
index acc87802..84f73fc8 100644
--- a/signal.c
+++ b/signal.c
@@ -117,20 +117,51 @@ void para_reap_children(void)
 }
 
 /**
- * Wrapper around signal(2).
+ * 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.
  *
- * 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.
  *
- * \return This function returns 1 on success and \p -E_SIGNAL_SIG_ERR on errors.
+ * \sa sigaction(2).
+ */
+int para_sigaction(int sig, void (*handler)(int))
+{
+	struct sigaction act;
+
+	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 -E_SIGNAL_SIG_ERR;
+	return 1;
+}
+
+/**
+ * Install the generic signal handler for the given signal number.
+ *
+ * \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).
+ * \sa signal(2), sigaction(2).
  */
 int 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;
+	return para_sigaction(sig, &generic_signal_handler);
 }
 
 /**