about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/sigwait.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-28 22:44:12 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-28 22:44:12 +0000
commit53b4fed6efb980044ff7152c725557de846a23bf (patch)
tree74d7b2cd655d39da0d24cdf0c37d3edc2b7980d6 /sysdeps/unix/sysv/linux/sigwait.c
parent6c81dc423b333d871a16083c74e42be68516e8e2 (diff)
downloadglibc-53b4fed6efb980044ff7152c725557de846a23bf.tar.gz
glibc-53b4fed6efb980044ff7152c725557de846a23bf.tar.xz
glibc-53b4fed6efb980044ff7152c725557de846a23bf.zip
Update.
	* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Make sure
	SIGSETXID is not blocked.
	* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Likewise.
	* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise.
	* sysdeps/unix/sysv/linux/sigprocmask.c (__sigprocmask): Likewise.
	* sysdeps/generic/sigfillset.c (sigfillset): Don't set SIGSETXID.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigwait.c')
-rw-r--r--sysdeps/unix/sysv/linux/sigwait.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/sigwait.c b/sysdeps/unix/sysv/linux/sigwait.c
index f755928493..7c865963cd 100644
--- a/sysdeps/unix/sysv/linux/sigwait.c
+++ b/sysdeps/unix/sysv/linux/sigwait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2000,2002,2003,2004 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
@@ -36,12 +36,20 @@ do_sigwait (const sigset_t *set, int *sig)
 
 #ifdef SIGCANCEL
   sigset_t tmpset;
-  if (set != NULL && __sigismember (set, SIGCANCEL))
+  if (set != NULL
+      && (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
+# ifdef SIGSETXID
+	  || __builtin_expect (__sigismember (set, SIGSETXID), 0)
+# endif
+	  ))
     {
       /* 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);
+# ifdef SIGSETXID
+      __sigdelset (&tmpset, SIGSETXID);
+# endif
       set = &tmpset;
     }
 #endif