about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/sigtimedwait.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-17 20:46:06 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-17 20:46:06 +0000
commitaa3cee213a291e2fd7298579059706622dd16793 (patch)
tree03e41fae515f7332a202683818f4d1d98053381a /sysdeps/unix/sysv/linux/sigtimedwait.c
parent047aec8f19cdb702f2a0645643f38a12033c353d (diff)
downloadglibc-aa3cee213a291e2fd7298579059706622dd16793.tar.gz
glibc-aa3cee213a291e2fd7298579059706622dd16793.tar.xz
glibc-aa3cee213a291e2fd7298579059706622dd16793.zip
Update.
	* sysdeps/unix/sysv/linux/sigtimedwait.c: If SIGCANCEL is defined
	and part of the incoming set, create a temporary set without this
	signal.
	* sysdeps/unix/sysv/linux/sigwait.c: Likewise.
	* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.

	returning because seconds==0.  Add __builtin_expect.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigtimedwait.c')
-rw-r--r--sysdeps/unix/sysv/linux/sigtimedwait.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c
index a22a1d2ea8..a016b71ec7 100644
--- a/sysdeps/unix/sysv/linux/sigtimedwait.c
+++ b/sysdeps/unix/sysv/linux/sigtimedwait.c
@@ -32,6 +32,18 @@ static int
 do_sigtimedwait (const sigset_t *set, siginfo_t *info,
 		 const struct timespec *timeout)
 {
+#ifdef SIGCANCEL
+  sigset_t tmpset;
+  if (set != NULL && __sigismember (set, SIGCANCEL))
+    {
+      /* Create a temporary mask without the bit for SIGCANCEL set.  */
+      // We are not copying more than we have to.
+      memcpy (&tmpset, set, _NSIG / 8);
+      __sigdelset (&tmpset, SIGCANCEL);
+      set = &tmpset;
+    }
+#endif
+
     /* XXX The size argument hopefully will have to be changed to the
        real size of the user-level sigset_t.  */
   int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),