X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=78e788d19021111b2f8ec712eb1ff8f0fd176375;hp=92f76c7b181b6c665f552ef5859c69ac3e6a891e;hb=cf749f79f1c353cc5aac1013aeef5ed0eb0f63ee;hpb=c184f843500dd59baa95fbbbab962a1691bf0217

diff --git a/signal.c b/signal.c
index 92f76c7b..78e788d1 100644
--- a/signal.c
+++ b/signal.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2004-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
-/** \file signal.c signal handling functions */
+/** \file signal.c Signal handling functions. */
 
 #include <signal.h>
 #include <sys/types.h>
@@ -40,15 +40,15 @@ int para_signal_init(void)
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err_out;
 	}
-	ret = mark_fd_nonblock(signal_pipe[0]);
+	ret = mark_fd_nonblocking(signal_pipe[0]);
 	if (ret < 0)
 		goto err_out;
-	ret = mark_fd_nonblock(signal_pipe[1]);
+	ret = mark_fd_nonblocking(signal_pipe[1]);
 	if (ret < 0)
 		goto err_out;
 	return signal_pipe[0];
 err_out:
-	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -85,13 +85,13 @@ int para_reap_child(pid_t *pid)
 	if (*pid < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	if (WIFEXITED(status))
-		PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", *pid,
+		PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", (int)*pid,
 			WEXITSTATUS(status));
 	else if (WIFSIGNALED(status))
-		PARA_DEBUG_LOG("child %i was killed by signal %i\n", *pid,
+		PARA_DEBUG_LOG("child %i was killed by signal %i\n", (int)*pid,
 			WTERMSIG(status));
 	else
-		PARA_WARNING_LOG("child %i terminated abormally\n", *pid);
+		PARA_WARNING_LOG("child %i terminated abormally\n", (int)*pid);
 	return 1;
 }
 
@@ -137,9 +137,18 @@ int para_next_signal(void)
 	int s;
 	ssize_t r;
 
-	if ((r = read(signal_pipe[0], &s, sizeof(s)) == sizeof(s)) > 0) {
+	r = read(signal_pipe[0], &s, sizeof(s));
+	if (r == sizeof(s)) {
 		PARA_DEBUG_LOG("next signal: %d\n", s);
 		return s;
 	}
 	return r < 0 && (errno != EAGAIN)? 0 : -E_SIGNAL_READ;
 }
+
+/**
+ * Close the signal pipe.
+ */
+void para_signal_shutdown(void)
+{
+	close(signal_pipe[1]);
+}