aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/posix/waitid.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-15 21:22:26 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-15 21:22:26 +0000
commit7a1147946ecd5fe962e2959afe69c25c7a553672 (patch)
treea6ffd9a6c377d19c531d24e4ac5f9e820a14b72e /sysdeps/posix/waitid.c
parent1fde494e69792603263bdf85819831f00d29cee4 (diff)
downloadglibc-7a1147946ecd5fe962e2959afe69c25c7a553672.zip
glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.gz
glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.bz2
Update.
2003-06-15 Ulrich Drepper <drepper@redhat.com> Fix cancellation point handling wrt exception based cleanup. * io/Makefile: Compile fcntl.c, poll.c, and lockf.c with exceptions. * misc/Makefile: Compile pselect.c, readv.c, writev.c, and usleep.c with exceptions. * posix/Makefile: Compile pread.c, pread64.c, pwrite.c, pwrite64.c, sleep.c, wait.c, waitid.c, and waitpid.c with exceptions. * rt/Makefile: Compile aio_suspend.c and clock_nanosleep.c with exceptions. * signal/Makefile: Compile sigpause.c, sigsuspend.c, sigtimedwait.c, sigwait.c, and sigwaitinfo.c with exceptions. * stdlib/Makefile: Compile system.c with exceptions. * sysvipc/Makefile: Compile msgrcv.c and msgsnd.c with exceptions. * termios/Makefile: Compile tcdrain.c with exceptions. * sysdeps/generic/lockf.c: Add comment explaining the cancellation situation. * sysdeps/generic/pselect.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/sleep.c: Likewise. * sysdeps/unix/sysv/linux/usleep.c: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Major rewrite of INTERNAL_SYSCALL to not use push inside asm statement so that unwind info is correct around the syscall. * sysdeps/unix/clock_nanosleep.c: Add cancellation support. * sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise.
Diffstat (limited to 'sysdeps/posix/waitid.c')
-rw-r--r--sysdeps/posix/waitid.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c
index 679d97d..e388d17 100644
--- a/sysdeps/posix/waitid.c
+++ b/sysdeps/posix/waitid.c
@@ -1,5 +1,5 @@
/* Pseudo implementation of waitid.
- Copyright (C) 1997, 1998, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1997.
@@ -66,6 +66,9 @@ do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
return -1;
}
+ /* Note the waitid() is a cancellation point. But since we call
+ waitpid() which itself is a cancellation point we do not have
+ to do anything here. */
child = __waitpid (pid, &status, options);
if (child == -1)