mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 05:40:06 +00:00
79937577d1
2004-09-13 Ulrich Drepper <drepper@redhat.com> * misc/sys/cdefs.h: Restore old definition of __P. * csu/munch.awk: Remove uses of __P and __PMT. * gmon/gmon.c: Likewise. * hesiod/hesiod.h: Likewise. * include/stdio.h: Likewise. * io/fts.c: Likewise. * libio/genops.c: Likewise. * libio/libioP.h: Likewise. * libio/fileops.c: Likewise. * libio/iolibio.h: Likewise. * libio/libio.h: Likewise. * libio/memstream.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/iopopen.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wgenops.c: Likewise. * libio/oldiopopen.c: Likewise. * locale/programs/xmalloc.c: Likewise. * locale/programs/xstrdup.c: Likewise. * malloc/mtrace.c: Likewise. * misc/getttyent.c: Likewise. * misc/getusershell.c: Likewise. * nis/rpcsvc/ypupd.h: Likewise. * posix/fnmatch.h: Likewise. * posix/glob.h: Likewise. * resolv/arpa/nameser.h: Likewise. * resolv/gethnamaddr.c: Likewise. * resolv/resolv.h: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/res_init.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * sysdeps/generic/chflags.c: Likewise. * sysdeps/generic/fchflags.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memcopy.h: Likewise. * sysdeps/generic/morecore.c: Likewise. * sysdeps/generic/sstk.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/standalone/arm/bits/errno.h: Likewise. * sysdeps/standalone/standalone.h: Likewise. * sysdeps/standalone/i386/force_cpu386/brdinit.c: Likewise. * sysdeps/standalone/i386/force_cpu386/_exit.c: Likewise. * sysdeps/unix/arm/start.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/wait4.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigvec.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/unix/sysv/getdents.c: Likewise. * sysdeps/unix/sysv/irix4/fpathconf.c: Likewise. * sysdeps/unix/sysv/irix4/getgroups.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/getrusage.c: Likewise. * sysdeps/unix/sysv/irix4/pathconf.c: Likewise. * sysdeps/unix/sysv/irix4/setgroups.c: Likewise. * sysdeps/unix/sysv/irix4/sigtramp.c: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/sysv/irix4/sysconf.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/getgroups.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/sethostname.c: Likewise. * sysdeps/unix/sysv/sysv4/setsid.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/getdents.c: Likewise. * time/tzset.c: Likewise. * time/strftime_l.c: Likewise. * time/strptime_l.c: Likewise. * crypt/md5.h: Likewise.
183 lines
4.5 KiB
C
183 lines
4.5 KiB
C
/* Copyright (C) 1991,92,1994-98,2002,2004 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <stddef.h>
|
|
|
|
/* Include macros to convert between `sigset_t' and old-style mask. */
|
|
#include <sigset-cvt-mask.h>
|
|
|
|
#ifndef SA_RESETHAND
|
|
/* When sigaction lacks the extension bit for it,
|
|
we use a wrapper handler to support SV_RESETHAND. */
|
|
struct sigvec_wrapper_data
|
|
{
|
|
__sighandler_t sw_handler;
|
|
unsigned int sw_mask;
|
|
};
|
|
|
|
static void sigvec_wrapper_handler (int sig) __THROW;
|
|
|
|
static struct sigvec_wrapper_data sigvec_wrapper_data[NSIG];
|
|
#endif
|
|
|
|
|
|
/* If VEC is non-NULL, set the handler for SIG to the `sv_handler' member
|
|
of VEC. The signals in `sv_mask' will be blocked while the handler runs.
|
|
If the SV_RESETHAND bit is set in `sv_flags', the handler for SIG will be
|
|
reset to SIG_DFL before `sv_handler' is entered. If OVEC is non-NULL,
|
|
it is filled in with the old information for SIG. */
|
|
int
|
|
__sigvec (sig, vec, ovec)
|
|
int sig;
|
|
const struct sigvec *vec;
|
|
struct sigvec *ovec;
|
|
{
|
|
struct sigaction old;
|
|
|
|
#ifndef SA_RESETHAND
|
|
if (vec == NULL || !(vec->sv_flags & SV_RESETHAND))
|
|
#endif
|
|
{
|
|
struct sigaction new, *n;
|
|
|
|
if (vec == NULL)
|
|
n = NULL;
|
|
else
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int mask;
|
|
unsigned int sv_flags;
|
|
unsigned int sa_flags;
|
|
|
|
handler = vec->sv_handler;
|
|
mask = vec->sv_mask;
|
|
sv_flags = vec->sv_flags;
|
|
sa_flags = 0;
|
|
if (sv_flags & SV_ONSTACK)
|
|
{
|
|
#ifdef SA_ONSTACK
|
|
sa_flags |= SA_ONSTACK;
|
|
#else
|
|
__set_errno (ENOSYS);
|
|
return -1;
|
|
#endif
|
|
}
|
|
#ifdef SA_RESTART
|
|
if (!(sv_flags & SV_INTERRUPT))
|
|
sa_flags |= SA_RESTART;
|
|
#endif
|
|
#ifdef SA_RESETHAND
|
|
if (sv_flags & SV_RESETHAND)
|
|
sa_flags |= SA_RESETHAND;
|
|
#endif
|
|
n = &new;
|
|
new.sa_handler = handler;
|
|
if (sigset_set_old_mask (&new.sa_mask, mask) < 0)
|
|
return -1;
|
|
new.sa_flags = sa_flags;
|
|
}
|
|
|
|
if (__sigaction (sig, n, &old) < 0)
|
|
return -1;
|
|
}
|
|
#ifndef SA_RESETHAND
|
|
else
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int mask;
|
|
struct sigvec_wrapper_data *data;
|
|
struct sigaction wrapper;
|
|
|
|
handler = vec->sv_handler;
|
|
mask = (unsigned int)vec->sv_mask;
|
|
data = &sigvec_wrapper_data[sig];
|
|
wrapper.sa_handler = sigvec_wrapper_handler;
|
|
/* FIXME: should we set wrapper.sa_mask, wrapper.sa_flags?? */
|
|
data->sw_handler = handler;
|
|
data->sw_mask = mask;
|
|
|
|
if (__sigaction (sig, &wrapper, &old) < 0)
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
if (ovec != NULL)
|
|
{
|
|
__sighandler_t handler;
|
|
unsigned int sv_flags;
|
|
unsigned int sa_flags;
|
|
unsigned int mask;
|
|
|
|
handler = old.sa_handler;
|
|
sv_flags = 0;
|
|
sa_flags = old.sa_flags;
|
|
#ifndef SA_RESETHAND
|
|
if (handler == sigvec_wrapper_handler)
|
|
{
|
|
handler = sigvec_wrapper_data[sig].sw_handler;
|
|
/* should we use data->sw_mask?? */
|
|
sv_flags |= SV_RESETHAND;
|
|
}
|
|
#else
|
|
if (sa_flags & SA_RESETHAND)
|
|
sv_flags |= SV_RESETHAND;
|
|
#endif
|
|
mask = sigset_get_old_mask (&old.sa_mask);
|
|
#ifdef SA_ONSTACK
|
|
if (sa_flags & SA_ONSTACK)
|
|
sv_flags |= SV_ONSTACK;
|
|
#endif
|
|
#ifdef SA_RESTART
|
|
if (!(sa_flags & SA_RESTART))
|
|
#endif
|
|
sv_flags |= SV_INTERRUPT;
|
|
ovec->sv_handler = handler;
|
|
ovec->sv_mask = (int)mask;
|
|
ovec->sv_flags = (int)sv_flags;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
weak_alias (__sigvec, sigvec)
|
|
|
|
#ifndef SA_RESETHAND
|
|
static void
|
|
sigvec_wrapper_handler (sig)
|
|
int sig;
|
|
{
|
|
struct sigvec_wrapper_data *data;
|
|
struct sigaction act;
|
|
int save;
|
|
__sighandler_t handler;
|
|
|
|
data = &sigvec_wrapper_data[sig];
|
|
act.sa_handler = SIG_DFL;
|
|
act.sa_flags = 0;
|
|
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);
|
|
}
|
|
#endif
|