aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/posix/waitid.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-15 10:26:23 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-15 10:26:23 +0000
commit6ee8d3345646ab0bea91891362a2bbf15503edec (patch)
tree718ea6deebec61e44b09eb25817ee5c14da35f57 /sysdeps/posix/waitid.c
parent2fb6444dbb9672aea7766b3790a3cb70a73473d3 (diff)
downloadglibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar
glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.gz
glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.bz2
glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.zip
Update.
2002-12-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/sysdep-cancel.h: Add dummy definitions for SINGLE_THREAD_P, LIBC_CANCEL_ASYNC, and LIBC_CANCEL_RESET. * sysdeps/unix/sysv/linux/open64.c: New file. * sysdeps/generic/pselect.c: Add support for cancellation handling. * sysdeps/posix/open64.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigwait.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/accept.S: Likewise. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/llseek.c: Likewise. * sysdeps/unix/sysv/linux/msgrcv.c: Likewise. * sysdeps/unix/sysv/linux/msgsnd.c: Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/wait.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
Diffstat (limited to 'sysdeps/posix/waitid.c')
-rw-r--r--sysdeps/posix/waitid.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c
index ef2ab2ed54..679d97d203 100644
--- a/sysdeps/posix/waitid.c
+++ b/sysdeps/posix/waitid.c
@@ -18,21 +18,18 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <assert.h>
#include <errno.h>
#include <signal.h>
#define __need_NULL
#include <stddef.h>
#include <sys/wait.h>
#include <sys/types.h>
+#include <sysdep-cancel.h>
-#include <assert.h>
-int
-__waitid (idtype, id, infop, options)
- idtype_t idtype;
- id_t id;
- siginfo_t *infop;
- int options;
+static int
+do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
{
pid_t pid, child;
int status;
@@ -118,5 +115,25 @@ __waitid (idtype, id, infop, options)
return 0;
}
+
+
+int
+__waitid (idtype, id, infop, options)
+ idtype_t idtype;
+ id_t id;
+ siginfo_t *infop;
+ int options;
+{
+ if (SINGLE_THREAD_P)
+ return do_waitid (idtype, id, infop, options);
+
+ int oldtype = LIBC_CANCEL_ASYNC ();
+
+ int result = do_waitid (idtype, id, infop, options);
+
+ LIBC_CANCEL_RESET (oldtype);
+
+ return result;
+}
weak_alias (__waitid, waitid)
strong_alias (__waitid, __libc_waitid)