Add an assertion.

diff --git a/ChangeLog b/ChangeLog
index 585e59ee6b43f306ad21f7395304b6c6c79eff5b..5269090b032c11ccf87f68dc62eb7603fad20271 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-10  Bruno Haible  <bruno@clisp.org>
+
+       * lib/wait-process.c (wait_subprocess): Add an assertion.
+
 2008-06-10  Bruno Haible  <bruno@clisp.org>
 
        * lib/wait-process.c (wait_subprocess): Try to fix waitid() based code.

diff --git a/lib/wait-process.c b/lib/wait-process.c
index e3086b4285ea210da71bda22046684d5013876d8..e98c644efb81c1045100c3ad02e9ffea88429b45 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -369,7 +369,8 @@ wait_subprocess (pid_t child, const char *progname,
        }
 
       /* One of WIFSIGNALED (status), WIFEXITED (status), WIFSTOPPED (status)
-        must always be true.  Loop until the program terminates.  */
+        must always be true, since we did not specify WCONTINUED in the
+        waitpid() call.  Loop until the program terminates.  */
       if (!WIFSTOPPED (status))
        break;
     }
@@ -394,6 +395,8 @@ wait_subprocess (pid_t child, const char *progname,
               progname, (int) WTERMSIG (status));
       return 127;
     }
+  if (!WIFEXITED (status))
+    abort ();
   if (WEXITSTATUS (status) == 127)
     {
       if (exit_on_error || !null_stderr)