diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-04-21 07:39:20 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-04-21 07:39:20 +0000 |
| commit | e7608d778994e0236b2fe66ec70bb0c5a0aa0282 (patch) | |
| tree | d2156ad08ad4e71afe0e74b9245c0ded5ef0718e /nptl/sysdeps/pthread/pthread_sigmask.c | |
| parent | a4faf24354ee98ef226a9012f2835cd771380882 (diff) | |
| download | glibc-e7608d778994e0236b2fe66ec70bb0c5a0aa0282.tar glibc-e7608d778994e0236b2fe66ec70bb0c5a0aa0282.tar.gz glibc-e7608d778994e0236b2fe66ec70bb0c5a0aa0282.tar.bz2 glibc-e7608d778994e0236b2fe66ec70bb0c5a0aa0282.zip | |
Update.
2003-04-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/sigprocmask.c: Prevent changing mask for
SIGCANCEL.
* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h: Define SI_TKILL.
* sysdeps/unix/sysv/linux/bits/siginfo.h: Define SI_TKILL.
* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Define SI_TKILL.
* sysdeps/unix/sysv/linux/s390/bits/siginfo.h: Define SI_TKILL.
* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h: Define SI_TKILL.
first syscall parameter to const char*.
Diffstat (limited to 'nptl/sysdeps/pthread/pthread_sigmask.c')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_sigmask.c | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/nptl/sysdeps/pthread/pthread_sigmask.c index df6ac64ddb..efe186ac2c 100644 --- a/nptl/sysdeps/pthread/pthread_sigmask.c +++ b/nptl/sysdeps/pthread/pthread_sigmask.c @@ -32,36 +32,13 @@ pthread_sigmask (how, newmask, oldmask) sigset_t local_newmask; /* The only thing we have to make sure here is that SIGCANCEL is not - blocked and that SIGTIMER is not unblocked. */ - if (newmask != NULL) + blocked. */ + if (newmask != NULL + && __builtin_expect (__sigismember (newmask, SIGCANCEL), 0)) { - if (__builtin_expect (__sigismember (newmask, SIGCANCEL), 0)) - { - local_newmask = *newmask; - __sigdelset (&local_newmask, SIGCANCEL); - newmask = &local_newmask; - } - - if (__builtin_expect (__sigismember (newmask, SIGTIMER), 0)) - { - if (how == SIG_UNBLOCK) - { - if (newmask != &local_newmask) - local_newmask = *newmask; - __sigdelset (&local_newmask, SIGTIMER); - newmask = &local_newmask; - } - } - else - { - if (how == SIG_SETMASK) - { - if (newmask != &local_newmask) - local_newmask = *newmask; - __sigaddset (&local_newmask, SIGTIMER); - newmask = &local_newmask; - } - } + local_newmask = *newmask; + __sigdelset (&local_newmask, SIGCANCEL); + newmask = &local_newmask; } #ifdef INTERNAL_SYSCALL |