X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=bf0cd5ccff28286852858e1b4f22bf00f9436f7b;hp=5f121063c10591731a253fb1f227dd1bb0f29da5;hb=32facbd1b7948f146515e53194cfd4f33c54353f;hpb=a50db8f0f9fd46211f0dccae287c9f016ae48019

diff --git a/signal.c b/signal.c
index 5f121063..bf0cd5cc 100644
--- a/signal.c
+++ b/signal.c
@@ -1,24 +1,18 @@
 /*
  * Copyright (C) 2004-2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file signal.c signal handling functions */
 
+#include <signal.h>
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "error.h"
+#include "fd.h"
+
 static int signal_pipe[2];
 
 /**
@@ -41,19 +35,18 @@ static int signal_pipe[2];
  */
 int para_signal_init(void)
 {
-	int i;
+	int ret = -E_SIGNAL_PIPE;
 	if (pipe(signal_pipe))
 		goto err_out;
-	for (i = 0; i < 2; i++) {
-		int fd = signal_pipe[i], flags = fcntl(fd, F_GETFL);
-		if (flags < 0)
-			goto err_out;
-		if (fcntl(fd, F_SETFL, ((long)flags) | O_NONBLOCK) < 0)
-			goto err_out;
-	}
+	ret = mark_fd_nonblock(signal_pipe[0]);
+	if (ret < 0)
+		goto err_out;
+	ret = mark_fd_nonblock(signal_pipe[1]);
+	if (ret < 0)
+		goto err_out;
 	return signal_pipe[0];
 err_out:
-	PARA_EMERG_LOG("%s", "pipe error: Can not setup signal pipe");
+	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -84,7 +77,7 @@ pid_t para_reap_child(void)
 	if (pid <= 0) {
 		if (pid < 0)
 			pid = -E_WAITPID;
-		return 0;
+		return pid;
 	}
 	if (WIFEXITED(status))
 		PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", pid,