dccp_send.c: Implement chunk queuing for dccp.

[paraslash.git] / signal.c

diff --git a/signal.c b/signal.c
index 82444cc81b9c1ffa7248e701ad36cd606b8fc877..0abe005c1a1fbea2b4cd30711b271a26fee27e57 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -1,33 +1,27 @@
 /*
  * 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 "para.h"
+#include "fd.h"
+
+#include <signal.h>
+
 #include "error.h"
 static int signal_pipe[2];
 
 /**
  * initialize the paraslash signal subsystem
  *
- * This function creates a pipe, the signal pipe, to deliver pending signals to
- * the application. It should be called during the application's startup part,
- * followed by subsequent calls to para_install_sighandler() for each signal
- * that should be caught.
+ * This function creates a pipe, the signal pipe, to deliver pending
+ * signals to the application (Bernstein's trick). It should be called
+ * during the application's startup part, followed by subsequent calls
+ * to para_install_sighandler() for each signal that should be caught.
  *
  * para_signal_init() installs a generic signal handler which is used for all
  * signals simultaneously. When a signal arrives, this generic signal handler
@@ -41,9 +35,18 @@ static int signal_pipe[2];
  */
 int para_signal_init(void)
 {
-       if (!pipe(signal_pipe))
-               return signal_pipe[0];
-       PARA_EMERG_LOG("%s", "pipe error: Can not setup signal pipe");
+       int ret = -E_SIGNAL_PIPE;
+       if (pipe(signal_pipe))
+               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\n", PARA_STRERROR(-ret));
        exit(EXIT_FAILURE);
 }
 
@@ -74,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,