From e7608d778994e0236b2fe66ec70bb0c5a0aa0282 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 Apr 2003 07:39:20 +0000 Subject: Update. 2003-04-21 Ulrich Drepper * 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*. --- sysdeps/unix/sysv/linux/sigprocmask.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'sysdeps/unix/sysv/linux/sigprocmask.c') diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index 7a73d9c373..db8986aafb 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,1999,2000,2001,2003 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 @@ -44,6 +44,19 @@ __sigprocmask (how, set, oset) const sigset_t *set; sigset_t *oset; { +#ifdef SIGCANCEL + sigset_t local_newmask; + + /* The only thing we have to make sure here is that SIGCANCEL is not + blocked. */ + if (set != NULL && __builtin_expect (__sigismember (set, SIGCANCEL), 0)) + { + local_newmask = *set; + __sigdelset (&local_newmask, SIGCANCEL); + set = &local_newmask; + } +#endif + #if __ASSUME_REALTIME_SIGNALS > 0 return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET_NULL_OK (set), CHECK_SIGSET_NULL_OK (oset), _NSIG / 8); -- cgit v1.2.3