* sysdeps/posix/system.c: Remove NO_WAITPID support, it cannot

	really work anyway.

diff --git a/ChangeLog b/ChangeLog
index fa2f6ab6e6dbbd1dc14596848508b87e92b51dc7..69a534f4e7bf8df3c7977714ad04724497902641 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-16  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/posix/system.c: Remove NO_WAITPID support, it cannot
+       really work anyway.
+
 2007-01-15  Ulrich Drepper  <drepper@redhat.com>
 
        * nscd/connections.c (servinfo): Renamed to reqinfo.  Change all

diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
index f63dde4dae4bea009e2cb78f35b16547361fa780..e78195ef822342d7afcc7784f8a72e7c0f0366f9 100644 (file)
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000, 2002, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2000,2002,2003,2005,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -143,27 +143,11 @@ do_system (const char *line)
   else
     /* Parent side.  */
     {
-#ifdef NO_WAITPID
-      pid_t child;
-      do
-       {
-         child = __wait (&status);
-         if (child <= -1 && errno != EINTR)
-           {
-             status = -1;
-             break;
-           }
-         /* Note that pid cannot be <= -1 and therefore the loop continues
-            when __wait returned with EINTR.  */
-       }
-      while (child != pid);
-#else
       /* Note the system() is a cancellation point.  But since we call
         waitpid() which itself is a cancellation point we do not
         have to do anything here.  */
       if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, 0)) != pid)
        status = -1;
-#endif
     }
 
 #ifdef CLEANUP_HANDLER