Add new "screenshots".

[paraslash.git] / signal.c

diff --git a/signal.c b/signal.c
index 128f6bba90fd0a9fd3b1f80adf8731d685438af1..3d1883f5f4b65f0c01b7b8944c6afbdb0d5f717c 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -40,10 +40,10 @@ 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];
@@ -64,7 +64,7 @@ static void generic_signal_handler(int s)
 /**
  * Reap one child.
  *
- * \para, pid In case a child died, its pid is returned here.
+ * \param pid In case a child died, its pid is returned here.
  *
  * Call waitpid() and print a log message containing the pid and the cause of
  * the child's death.
@@ -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;
 }
 
@@ -143,3 +143,11 @@ int para_next_signal(void)
        }
        return r < 0 && (errno != EAGAIN)? 0 : -E_SIGNAL_READ;
 }
+
+/**
+ * Close the signal pipe.
+ */
+void para_signal_shutdown(void)
+{
+       close(signal_pipe[1]);
+}