summaryrefslogtreecommitdiff
path: root/libc/signal/sigsetmask.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-01-02 12:18:50 +0000
committerEric Andersen <andersen@codepoet.org>2002-01-02 12:18:50 +0000
commitb88ff80f703931b368d27ebd898accdae5b31e60 (patch)
tree79aa8e4d9b249e165973423a04fb3b4889308aa3 /libc/signal/sigsetmask.c
parentcac4a2ef934d7ac5314c874b88b62e922fc70690 (diff)
Once again, rework the signal handling to be even more correct. We no
longer segfault when running test/signal/sigchld.c, which exposed a bit of a rats nest. The problem ended up being a erroneous syscall defination, but in the process of finding that out, I scrubbed things up nicely and adapted things to use the rt_ signals if they are available. This now passes all the signal tests. -Erik
Diffstat (limited to 'libc/signal/sigsetmask.c')
-rw-r--r--libc/signal/sigsetmask.c53
1 files changed, 53 insertions, 0 deletions
diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c
new file mode 100644
index 000000000..632eaff2a
--- /dev/null
+++ b/libc/signal/sigsetmask.c
@@ -0,0 +1,53 @@
+/* Copyright (C) 1991,1994,1995,1996,1997,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 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.
+
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <errno.h>
+#include <signal.h>
+
+/* Set the mask of blocked signals to MASK, returning the old mask. */
+int sigsetmask (int mask)
+{
+ register unsigned int sig;
+ sigset_t set, oset;
+
+ if (__sigemptyset (&set) < 0)
+ return -1;
+
+ 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_SETMASK, &set, &oset) < 0)
+ return -1;
+
+ 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;
+}