aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-01-17 04:39:59 +0000
committerUlrich Drepper <drepper@redhat.com>2007-01-17 04:39:59 +0000
commitd78bce1c01fe67d02d833e026e5acbb88d1d9836 (patch)
tree907027b8a3c11257b7ba0d85fa4b731634d8821d
parent000b027e7c0866334321e92034a5a807cd437c7c (diff)
downloadglibc-d78bce1c01fe67d02d833e026e5acbb88d1d9836.zip
glibc-d78bce1c01fe67d02d833e026e5acbb88d1d9836.tar.gz
glibc-d78bce1c01fe67d02d833e026e5acbb88d1d9836.tar.bz2
* sysdeps/posix/system.c: Remove NO_WAITPID support, it cannot
really work anyway.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/system.c18
2 files changed, 6 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index fa2f6ab..69a534f 100644
--- 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 f63dde4..e78195e 100644
--- 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