diff options
Diffstat (limited to 'sysdeps/posix')
-rw-r--r-- | sysdeps/posix/sigblock.c | 27 | ||||
-rw-r--r-- | sysdeps/posix/sigpause.c | 19 | ||||
-rw-r--r-- | sysdeps/posix/sigsetmask.c | 27 | ||||
-rw-r--r-- | sysdeps/posix/sigvec.c | 16 |
4 files changed, 22 insertions, 67 deletions
diff --git a/sysdeps/posix/sigblock.c b/sysdeps/posix/sigblock.c index 6edf3a8ff1..143b4c8d4c 100644 --- a/sysdeps/posix/sigblock.c +++ b/sysdeps/posix/sigblock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 94, 95, 96, 97, 98, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994-1998, 2001-2002 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 @@ -19,39 +19,22 @@ #include <errno.h> #include <signal.h> +#include <sigset-cvt-mask.h> + /* Block signals in MASK, returning the old mask. */ int __sigblock (mask) int mask; { - register unsigned int sig; sigset_t set, oset; - if (__sigemptyset (&set) < 0) + if (sigset_set_old_mask (&set, mask) < 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_BLOCK, &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; + return sigset_get_old_mask (&oset); } weak_alias (__sigblock, sigblock) diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index fc5f79e31e..71818740ed 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -20,13 +20,14 @@ #include <signal.h> #include <stddef.h> /* For NULL. */ +#include <sigset-cvt-mask.h> + /* Set the mask of blocked signals to MASK, wait for a signal to arrive, and then restore the mask. */ int __sigpause (int sig_or_mask, int is_sig) { sigset_t set; - int sig; if (is_sig != 0) { @@ -36,20 +37,8 @@ __sigpause (int sig_or_mask, int is_sig) || __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; - } + else if (sigset_set_old_mask (&set, sig_or_mask) < 0) + return -1; return __sigsuspend (&set); } diff --git a/sysdeps/posix/sigsetmask.c b/sysdeps/posix/sigsetmask.c index 7b97a514b0..bb50e4fc10 100644 --- a/sysdeps/posix/sigsetmask.c +++ b/sysdeps/posix/sigsetmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1994,1995,1996,1997,2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,1994-1997,2001-2002 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 @@ -19,38 +19,21 @@ #include <errno.h> #include <signal.h> +#include <sigset-cvt-mask.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) + if (sigset_set_old_mask (&set, mask) < 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; + return sigset_get_old_mask (&oset); } weak_alias (__sigsetmask, sigsetmask) diff --git a/sysdeps/posix/sigvec.c b/sysdeps/posix/sigvec.c index d5f7ccdb4a..d1b80e297a 100644 --- a/sysdeps/posix/sigvec.c +++ b/sysdeps/posix/sigvec.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,2002 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 @@ -21,7 +21,7 @@ #include <stddef.h> /* Include macros to convert between `sigset_t' and old-style mask. */ -#include "sigset-cvt-mask.h" +#include <sigset-cvt-mask.h> /* We use a wrapper handler to support SV_RESETHAND. */ struct sigvec_wrapper_data @@ -80,7 +80,8 @@ __sigvec (sig, vec, ovec) #endif n = &new; new.sa_handler = handler; - sigset_set_old_mask (&new.sa_mask, mask); + if (sigset_set_old_mask (&new.sa_mask, mask) < 0) + return -1; new.sa_flags = sa_flags; } @@ -122,7 +123,7 @@ __sigvec (sig, vec, ovec) /* should we use data->sw_mask?? */ sv_flags |= SV_RESETHAND; } - sigset_get_old_mask (&old.sa_mask, mask); + mask = sigset_get_old_mask (&old.sa_mask); #ifdef SA_ONSTACK if (sa_flags & SA_ONSTACK) sv_flags |= SV_ONSTACK; @@ -147,19 +148,18 @@ sigvec_wrapper_handler (sig) int sig; { struct sigvec_wrapper_data *data; - unsigned int mask; struct sigaction act; int save; __sighandler_t handler; data = &sigvec_wrapper_data[sig]; - mask = data->sw_mask; act.sa_handler = SIG_DFL; - sigset_set_old_mask (&act.sa_mask, mask); act.sa_flags = 0; - save = errno; + sigset_set_old_mask (&act.sa_mask, data->sw_mask); handler = data->sw_handler; + save = errno; (void) __sigaction (sig, &act, (struct sigaction *) NULL); __set_errno (save); + (*handler) (sig); } |