summaryrefslogtreecommitdiff
path: root/libc/signal/sigblock.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-10-17 06:02:35 +0000
committerEric Andersen <andersen@codepoet.org>2001-10-17 06:02:35 +0000
commitcd2b5379fc8fa51a7117185094ff070105abc749 (patch)
treebf4dd05734e3e034152013d5596e7ac51a03b571 /libc/signal/sigblock.c
parentb1c97c3b65453ab7c5c736550e88ff3d4b51a57d (diff)
Fix up sig handling so it is more in sync with glibc behavior
Diffstat (limited to 'libc/signal/sigblock.c')
-rw-r--r--libc/signal/sigblock.c65
1 files changed, 38 insertions, 27 deletions
diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c
index 78d7a19be..f47b75804 100644
--- a/libc/signal/sigblock.c
+++ b/libc/signal/sigblock.c
@@ -1,45 +1,56 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 94, 95, 96, 97, 98, 2001 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 Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ 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
-Library General Public License for more details.
+ 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 Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
-#include <stdlib.h>
#include <errno.h>
+#define __USE_GNU
#include <signal.h>
/* Block signals in MASK, returning the old mask. */
-int sigblock (int mask)
+int sigblock (mask)
+ int mask;
{
- register int sig;
+ register unsigned int sig;
sigset_t set, oset;
- if (sigemptyset(&set) < 0)
+ if (__sigemptyset (&set) < 0)
return -1;
-
- for (sig = 1; sig < NSIG; ++sig)
- if ((mask & sigmask(sig)) && sigaddset(&set, sig) < 0)
- return -1;
- if (sigprocmask(SIG_BLOCK, &set, &oset) < 0)
+ if (sizeof (mask) == sizeof (set))
+ *(int *) &set = mask;
+ else if (sizeof (unsigned long int) == sizeof (set))
+ *(unsigned long int *) &set = (unsigned int) mask;
+ else
+ for (sig = 1; sig < NSIG && sig <= sizeof (mask) * 8; ++sig)
+ if ((mask & sigmask (sig)) && __sigaddset (&set, sig) < 0)
+ return -1;
+
+ if (sigprocmask (SIG_BLOCK, &set, &oset) < 0)
return -1;
- mask = 0;
- for (sig = 1; sig < NSIG; ++sig)
- if (sigismember(&oset, sig))
- mask |= sigmask(sig);
+ if (sizeof (mask) == sizeof (oset))
+ mask = *(int *) &oset;
+ else if (sizeof (unsigned long int) == sizeof (oset))
+ mask = *(unsigned long int*) &oset;
+ else
+ for (sig = 1, mask = 0; sig < NSIG && sig <= sizeof (mask) * 8; ++sig)
+ if (__sigismember (&oset, sig))
+ mask |= sigmask (sig);
return mask;
}
+