diff options
| author | Roland McGrath <roland@gnu.org> | 2002-08-27 02:43:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-08-27 02:43:22 +0000 |
| commit | b5d482d00ef8bc29f0b4dd84812d52759ebdd630 (patch) | |
| tree | 95299ffce18eb88410cc0d49cc898a9fd40cc302 /sysdeps/generic | |
| parent | 20acbc25428bb7c9a78de37236285a09108da313 (diff) | |
| download | glibc-b5d482d00ef8bc29f0b4dd84812d52759ebdd630.tar.gz glibc-b5d482d00ef8bc29f0b4dd84812d52759ebdd630.tar.xz glibc-b5d482d00ef8bc29f0b4dd84812d52759ebdd630.zip | |
* sysdeps/generic/sigset-cvt-mask.h (sigset_set_old_mask): Replace
macro with inline function. (sigset_get_old_mask): Likewise. * sysdeps/posix/sigblock.c (__sigblock): Update callers. * sysdeps/posix/sigsetmask.c (__sigsetmask): Likewise. * sysdeps/posix/sigpause.c (__sigpause): Likewise. * sysdeps/posix/sigvec.c (__sigvec, sigvec_wrapper_handler): Likewise. * sysdeps/unix/sysv/aix/sigset-cvt-mask.h (sigset_set_old_mask, sigset_get_old_mask): Make these macros return values. * sysdeps/unix/sysv/linux/sigset-cvt-mask.h: Likewise. * sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h: Likewise. 2002-07-06 Bruno Haible <bruno@clisp.org> * sysdeps/generic/sigset-cvt-mask.h (sigset_set_old_mask, sigset_get_old_mask): Make it work with larger sigset_t. * sysdeps/posix/sigblock.c (__sigblock): Use those macros. * sysdeps/posix/sigsetmask.c (__sigsetmask): Likewise. * sysdeps/posix/sigpause.c (__sigpause): Likewise. 2002-08-26 Roland McGrath <roland@redhat.com>
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/sigset-cvt-mask.h | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/sysdeps/generic/sigset-cvt-mask.h b/sysdeps/generic/sigset-cvt-mask.h index b202e56b9e..c9a0434e7e 100644 --- a/sysdeps/generic/sigset-cvt-mask.h +++ b/sysdeps/generic/sigset-cvt-mask.h @@ -1,6 +1,6 @@ /* Convert between lowlevel sigmask and libc representation of sigset_t. Generic version. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Joe Keane <jgk@jgk.org>. @@ -19,6 +19,46 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define sigset_set_old_mask(set, mask) (*(set) = (unsigned long int) (mask)) +/* Convert between an old-style 32-bit signal mask and a POSIX sigset_t. */ -#define sigset_get_old_mask(set, mask) ((mask) = (unsigned int) *(set)) +/* Perform *SET = MASK. Unused bits of *SET are set to 0. + Returns zero for success or -1 for errors (from sigaddset/sigemptyset). */ +static inline int __attribute__ ((unused)) +sigset_set_old_mask (sigset_t *set, int mask) +{ + if (sizeof (__sigset_t) == sizeof (unsigned int)) + *set = (unsigned int) (mask); + else + { + register unsigned int __sig; + + if (__sigemptyset (set) < 0) + return -1; + + for (__sig = 1; __sig < NSIG && __sig <= sizeof (mask) * 8; __sig++) + if (mask & sigmask (__sig)) + if (__sigaddset (set, __sig) < 0) + return -1; + } + return 0; +} + +/* Return the sigmask corresponding to *SET. + Unused bits of *SET are thrown away. */ +static inline int __attribute__ ((unused)) +sigset_get_old_mask (const sigset_t *set) +{ + if (sizeof (sigset_t) == sizeof (unsigned int)) + return (unsigned int) *set; + else + { + unsigned int mask = 0; + register unsigned int sig; + + for (sig = 1; sig < NSIG && sig <= sizeof (mask) * 8; sig++) + if (__sigismember (set, sig)) + mask |= sigmask (sig); + + return mask; + } +} |