Try to fix waitid() based code.

diff --git a/ChangeLog b/ChangeLog
index 97aec20e88ff540237640c26601600a4966d23df..585e59ee6b43f306ad21f7395304b6c6c79eff5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-10  Bruno Haible  <bruno@clisp.org>
+
+       * lib/wait-process.c (wait_subprocess): Try to fix waitid() based code.
+
 2008-06-10  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-memmem.c (main): Reset SIGALRM to default handling before

diff --git a/lib/wait-process.c b/lib/wait-process.c
index 97bc57fe5f19e1df178f93699dce5c283e801c4b..e3086b4285ea210da71bda22046684d5013876d8 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -253,9 +253,9 @@ wait_subprocess (pid_t child, const char *progname,
                 bool slave_process, bool exit_on_error)
 {
 #if HAVE_WAITID && defined WNOWAIT && 0
-  /* Commented out because waitid() with WNOWAIT doesn't work: On Solaris 7
-     and OSF/1 4.0, it returns -1 and sets errno = ECHILD, and on HP-UX 10.20
-     it just hangs.  */
+  /* Commented out because waitid() without WEXITED and with WNOWAIT doesn't
+     work: On Solaris 7 and OSF/1 4.0, it returns -1 and sets errno = ECHILD,
+     and on HP-UX 10.20 it just hangs.  */
   /* Use of waitid() with WNOWAIT avoids a race condition: If slave_process is
      true, and this process sleeps a very long time between the return from
      waitpid() and the execution of unregister_slave_subprocess(), and
@@ -265,7 +265,8 @@ wait_subprocess (pid_t child, const char *progname,
   siginfo_t info;
   for (;;)
     {
-      if (waitid (P_PID, child, &info, slave_process ? WNOWAIT : 0) < 0)
+      if (waitid (P_PID, child, &info, WEXITED | (slave_process ? WNOWAIT : 0))
+         < 0)
        {
 # ifdef EINTR
          if (errno == EINTR)
@@ -297,7 +298,7 @@ wait_subprocess (pid_t child, const char *progname,
       /* Now remove the zombie from the process list.  */
       for (;;)
        {
-         if (waitid (P_PID, child, &info, 0) < 0)
+         if (waitid (P_PID, child, &info, WEXITED) < 0)
            {
 # ifdef EINTR
              if (errno == EINTR)