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

diff --git a/signal.c b/signal.c
index 9168e918..9a1dcfb0 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.
  */
@@ -117,20 +117,34 @@ void para_reap_children(void)
 }
 
 /**
- * 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)
 {
+	struct sigaction act;
+
 	PARA_DEBUG_LOG("catching signal %d\n", sig);
-	return signal(sig, &generic_signal_handler) == SIG_ERR?  -E_SIGNAL_SIG_ERR : 1;
+	act.sa_handler = &generic_signal_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;
 }
 
 /**