X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=2d5549d59817b151ae6780fa43e083f881c81ea9;hp=da395157c29ae8aff0459a2731e10ae7a13e90e6;hb=3d875f51dcbb6b07c4698d0696b8b946997e6373;hpb=271c83d4fd9411be628fa650ce595ac79754d22e

diff --git a/signal.c b/signal.c
index da395157..2d5549d5 100644
--- a/signal.c
+++ b/signal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 
 #include <signal.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -149,29 +148,26 @@ void para_install_sighandler(int sig)
 }
 
 /**
- * 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.
+ * \param rfds The fd_set containing the signal pipe.
  *
- * \return On success, the number of the received signal is returned.  If the
- * read returned zero or was interrupted by another signal the function returns
- * 0.  Otherwise, a negative error value is returned.
+ * \return On success, the number of the received signal is returned. If there
+ * is no signal currently pending, the function returns zero. On read errors
+ * from the signal pipe, the process is terminated.
  */
-int para_next_signal(void)
+int para_next_signal(fd_set *rfds)
 {
-	int s;
-	ssize_t r = read(signal_pipe[0], &s, sizeof(s));
+	size_t n;
+	int s, ret = read_nonblock(signal_pipe[0], &s, sizeof(s), rfds, &n);
 
-	if (!r) {
-		PARA_CRIT_LOG("read from signal pipe returned zero\n");
-		return 0;
-	}
-	if (r < 0) {
-		if (errno == EAGAIN || errno == EINTR)
-			return 0;
-		return -ERRNO_TO_PARA_ERROR(errno);
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		exit(EXIT_FAILURE);
 	}
-	assert(r == sizeof(s));
+	if (n == 0)
+		return 0;
+	assert(n == sizeof(s));
 	PARA_DEBUG_LOG("next signal: %d\n", s);
 	return s;
 }