Get rid of E_WAITPID.

diff --git a/error.h b/error.h
index cc953d28aa4a38731257880225eea98a66611997..40cccd5691ab537eb3cdd227e76971be68c4ef6a 100644 (file)
--- a/error.h
+++ b/error.h
@@ -264,7 +264,6 @@ extern const char **para_errlist[];
 #define SIGNAL_ERRORS \
        PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
        PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
-       PARA_ERROR(WAITPID, "waitpid error"), \
 
 
 #define STRING_ERRORS \

diff --git a/gui.c b/gui.c
index f884e8643140fcb0145bb0a7a193a36618e96b9e..a71a2a7c4ab2bf7355401f32450cdbab47837ae3 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -726,10 +726,11 @@ static void init_curses(void)
 
 static void check_sigchld(void)
 {
+       int ret;
        pid_t pid;
 reap_next_child:
-       pid = para_reap_child();
-       if (pid <= 0)
+       ret = para_reap_child(&pid);
+       if (ret <= 0)
                return;
        if (pid == cmd_pid) {
                cmd_pid = 0;

diff --git a/server.c b/server.c
index d5946e47386c03a40a802a1d407a69f7b0659fef..7171c6e2814808ae19132f9a4c199485536bd727 100644 (file)
--- a/server.c
+++ b/server.c
@@ -540,8 +540,8 @@ repeat:
                        break;
                case SIGCHLD:
                        for (;;) {
-                               pid = para_reap_child();
-                               if (pid <= 0)
+                               ret = para_reap_child(&pid);
+                               if (ret <= 0)
                                        break;
                                if (pid != afs_pid)
                                        continue;

diff --git a/signal.c b/signal.c
index 1db008ca89a92a23f3c08017a74be04e3e06f1d5..128f6bba90fd0a9fd3b1f80adf8731d685438af1 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -62,45 +62,50 @@ static void generic_signal_handler(int s)
 }
 
 /**
- * reap one child
+ * Reap one child.
  *
- * call waitpid() and print a log message containing the pid
- * and the cause of the child's death.
+ * \para, 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.
+ *
+ * \return A (negative) paraslash error code on errors, zero, if no child died,
+ * one otherwise. If and only if the function returns one, the content of \a
+ * pid is meaningful.
  *
- * \return Like \p waitpid(), this function returns the process ID of the
- * terminated child; on error, \p -E_WAITPID is returned.
  * \sa waitpid(2)
  */
-pid_t para_reap_child(void)
+int para_reap_child(pid_t *pid)
 {
        int status;
-       pid_t pid = waitpid(-1, &status, WNOHANG);
+       *pid = waitpid(-1, &status, WNOHANG);
 
-       if (pid <= 0) {
-               if (pid < 0)
-                       pid = -E_WAITPID;
-               return pid;
-       }
+       if (!*pid)
+               return 0;
+       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", *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", *pid,
                        WTERMSIG(status));
        else
-               PARA_WARNING_LOG("child %i terminated abormally\n", pid);
-       return pid;
+               PARA_WARNING_LOG("child %i terminated abormally\n", *pid);
+       return 1;
 }
 
 /**
- * paraslash's zombie killer
+ * Paraslash's zombie killer.
  *
  * It just calls \p para_reap_child() until there are no more children left to
  * reap.
  */
 void para_reap_children(void)
 {
-       while (para_reap_child() > 0)
+       pid_t pid;
+
+       while (para_reap_child(&pid) > 0)
                ; /* nothing */
 }
 

diff --git a/signal.h b/signal.h
index 921448305764109d83907981826e498853e68fbf..5df64c33f7e0a6b8a441efef82b04c355fc62a2d 100644 (file)
--- a/signal.h
+++ b/signal.h
@@ -21,5 +21,5 @@ struct signal_task {
 int para_signal_init(void);
 int para_install_sighandler(int);
 void para_reap_children(void);
-pid_t para_reap_child(void);
+int para_reap_child(pid_t *pid);
 int para_next_signal(void);