summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-05-16 21:39:34 +0000
committerEric Andersen <andersen@codepoet.org>2001-05-16 21:39:34 +0000
commitf2eb46b4e6cf7ac023106a0d688d0e55b88cabaa (patch)
treec25c2f8ecd274e5b47e45c15f0bc09c682d70486 /libc
parent11cd5e7f00a5d24b72f943c55ac0f6e2a809d8a8 (diff)
Sigpause was broken. Now it is fixed.
-Erik
Diffstat (limited to 'libc')
-rw-r--r--libc/signal/sigpause.c70
1 files changed, 49 insertions, 21 deletions
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index ff9809482..433b92b0c 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -1,37 +1,65 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 92, 1994-1998, 2000 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 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.
+ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ 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>
-
-#undef sigpause
+#include <stddef.h> /* For NULL. */
/* Set the mask of blocked signals to MASK,
wait for a signal to arrive, and then restore the mask. */
-int sigpause(int mask)
+int __sigpause (int sig_or_mask, int is_sig)
{
sigset_t set;
int sig;
- sigemptyset(&set);
- for (sig = 1; sig < NSIG; ++sig)
- if (mask & sigmask(sig))
- sigaddset(&set, sig);
+ if (is_sig != 0)
+ {
+ /* The modern X/Open implementation is requested. */
+ if (sigprocmask (0, NULL, &set) < 0
+ /* Yes, we call `sigdelset' and not `__sigdelset'. */
+ || sigdelset (&set, sig_or_mask) < 0)
+ return -1;
+ }
+ else
+ {
+ if (sigemptyset (&set) < 0)
+ return -1;
+
+ if (sizeof (sig_or_mask) == sizeof (set))
+ *(int *) &set = sig_or_mask;
+ else if (sizeof (unsigned long int) == sizeof (set))
+ *(unsigned long int *) &set = (unsigned int) sig_or_mask;
+ else
+ for (sig = 1; sig < NSIG; ++sig)
+ if ((sig_or_mask & sigmask (sig)) && __sigaddset (&set, sig) < 0)
+ return -1;
+ }
return sigsuspend (&set);
}
+
+
+#undef sigpause
+
+/* We have to provide a default version of this function since the
+ standards demand it. The version which is a bit more reasonable is
+ the BSD version. So make this the default. */
+int sigpause (int mask)
+{
+ return __sigpause (mask, 0);
+}