X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=59a0d45aba7ad975fc287862308891435c4e9095;hp=f8be2f4612002214f669fa74ce92390866b0dc90;hb=8ea8abb73199b32fdd7afdf8825afa42ed8de244;hpb=97727c2e95cce064e03f495e97119cae447397d7

diff --git a/signal.c b/signal.c
index f8be2f46..59a0d45a 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.
  */
@@ -57,8 +57,15 @@ err_out:
  */
 static void generic_signal_handler(int s)
 {
-	write(signal_pipe[1], &s, sizeof(int));
-	//fprintf(stderr, "got sig %i, write returned %d\n", s, ret);
+	ssize_t ret = write(signal_pipe[1], &s, sizeof(int));
+
+	if (ret == sizeof(int))
+		return;
+	if (ret < 0)
+		PARA_EMERG_LOG("%s\n", strerror(errno));
+	else
+		PARA_EMERG_LOG("short write to signal pipe\n");
+	exit(EXIT_FAILURE);
 }
 
 /**
@@ -110,20 +117,49 @@ 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.
+ * This either succeeds or calls exit(EXIT_FAILURE).
  *
- * \return This function returns 1 on success and \p -E_SIGNAL_SIG_ERR on errors.
- *
- * \sa signal(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);
-	return signal(sig, &generic_signal_handler) == SIG_ERR?  -E_SIGNAL_SIG_ERR : 1;
+	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);
+}
+
+/**
+ * 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);
 }
 
 /**