[commits] r1211 - in /fsf/trunk/libc: ChangeLog sysdeps/posix/system.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan 17 00:01:30 2007
New Revision: 1211

Log:
Import glibc-mainline for 2007-01-17

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/posix/system.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan 17 00:01:30 2007
@@ -1,3 +1,8 @@
+2007-01-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/posix/system.c: Remove NO_WAITPID support, it cannot
+	really work anyway.
+
 2007-01-15  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* nscd/connections.c (servinfo): Renamed to reqinfo.  Change all

Modified: fsf/trunk/libc/sysdeps/posix/system.c
==============================================================================
--- fsf/trunk/libc/sysdeps/posix/system.c (original)
+++ fsf/trunk/libc/sysdeps/posix/system.c Wed Jan 17 00:01:30 2007
@@ -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 @@
   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