mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-28 13:31:13 +00:00
87bbc4cf1e
sigprocmask.c, sigtimedwait.c, sigwait.c and sigwaitinfo.c files from sysdeps/unix/sysv/linux include nptl-signals.h via nptl/pthreadP.h, and so SIGCANCEL and SIGSETXID become defined unconditionally. But later in the code, there are some checks weither symbols defined, which is useless. This patch removes useless checks. Checked on x86_64-linux-gnu. * sysdeps/unix/sysv/linux/sigprocmask.c: Remove useless #ifdefs. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. Signed-off-by: Yury Norov <ynorov@caviumnetworks.com> Reviewed-by: Andreas Schwab <schwab@suse.de> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
51 lines
1.7 KiB
C
51 lines
1.7 KiB
C
/* Copyright (C) 1997-2017 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <string.h> /* Needed for string function builtin redirection. */
|
|
#include <unistd.h>
|
|
|
|
#include <sysdep.h>
|
|
#include <sys/syscall.h>
|
|
|
|
#include <nptl/pthreadP.h> /* SIGCANCEL, SIGSETXID */
|
|
|
|
|
|
/* Get and/or change the set of blocked signals. */
|
|
int
|
|
__sigprocmask (int how, const sigset_t *set, sigset_t *oset)
|
|
{
|
|
sigset_t local_newmask;
|
|
|
|
/* The only thing we have to make sure here is that SIGCANCEL and
|
|
SIGSETXID are not blocked. */
|
|
if (set != NULL
|
|
&& (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
|
|
|| __builtin_expect (__sigismember (set, SIGSETXID), 0)))
|
|
{
|
|
local_newmask = *set;
|
|
__sigdelset (&local_newmask, SIGCANCEL);
|
|
__sigdelset (&local_newmask, SIGSETXID);
|
|
set = &local_newmask;
|
|
}
|
|
|
|
return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
|
|
}
|
|
libc_hidden_def (__sigprocmask)
|
|
weak_alias (__sigprocmask, sigprocmask)
|