lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* sysdeps/generic/sigset-cvt-mask.h (sigset_set_old_mask): Replace

Browse Source 
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>
This commit is contained in:
Roland McGrath
2002-08-27 02:43:22 +00:00
parent 20acbc2542
commit b5d482d00e
9 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sysdeps/posix/sigblock.c
View File

@ -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)