diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-02-24 15:22:29 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-02-24 15:22:29 +0000 |
commit | 14e9dd679a43ef9eb90adc0764152045caab6146 (patch) | |
tree | 5fe46c23560e40ecd94ac79fbe1a07cd4b32c7b6 /sysdeps/unix/sysv/linux/sigaction.c | |
parent | dfbad9c855e5aee39492fdc9fbe98eac5846f49c (diff) | |
download | glibc-14e9dd679a43ef9eb90adc0764152045caab6146.tar.gz glibc-14e9dd679a43ef9eb90adc0764152045caab6146.tar.xz glibc-14e9dd679a43ef9eb90adc0764152045caab6146.zip |
Update.
1998-02-24 15:12 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Filter out frame-pointer effecting options when compiling profiling or debugging code. * config.h.in (internal_function): Don't define here if PROF is defined. * gmon/gmon.c (__moncontrol): Don't change state if already in error state. (__monstartup): If calloc fails set error state and mark array as not allocated. (_mcleanup): Don't call write_gmon if in error state. Don't try to free array if not successfully allocated. * elf/dl-load.c (STRING): Define to __STRING to enble expansion. Include elf.h to get macro definitions. Use __ELF?NATIVE?CLASS in message, not __ELF_WORDSIZE. 1998-02-24 09:40 Ulrich Drepper <drepper@cygnus.com> * elf/ldd.sh.in: Add compatibility for broken old shells. * elf/ldd.bash.in: Likewise. 1998-02-24 08:11 H.J. Lu <hjl@gnu.org> * sunrpc/rpc_main.c (open_input): Check pipe return error. * time/clocktest.c (main): Check signal return error. 1998-02-24 Andreas Jaeger <aj@arthur.rhein-neckar.de> * iconv/Makefile ($(inst_bindir)/iconv): Correct typo, add "/" and use do-install-program. Reported by Mark M. Kettenis. (subdir_install): Likewise. 1998-02-22 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/rpc_sample.c: Fix typo. * nscd/connections.c: Use locale. * nscd/grpcache.c: Add debug messages, gidtbl should get the calloc result. * nscd/nscd.c: Check if init functions fails. * nscd/nscd_conf.c: Allow disabling of group cache. * nscd/nscd_getgr_r.c: Fix return code if group not found. * nscd/pwdcache.c: Fix debug messages. 1998-02-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add __monstartup and _mcleanup for profiling support. 1998-02-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Export __getpagesize, for binary compatibility with 2.0. 1998-02-21 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/globtest.sh: Use --library-path instead of LD_LIBRARY_PATH. * localedata/sort-test.sh: Likewise. * localedata/tst-fmon.sh: Likewise. Avoid useless use of cat. 1998-02-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sigaction.c: Translate between struct sigaction and struct kernel_sigaction for __syscall_rt_sigaction. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/kernel_sigaction.h (struct kernel_sigaction): Define. * sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h (struct kernel_sigaction): Define. 1998-02-23 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c: Change epsilons for libm-ieee754. 1998-02-23 12:33 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/__longjmp.S: Fix race condition. Reported by Bruno Haible <haible@ilog.fr>.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigaction.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/sigaction.c | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c index 510cbe7040..5f9a7feac3 100644 --- a/sysdeps/unix/sysv/linux/sigaction.c +++ b/sysdeps/unix/sysv/linux/sigaction.c @@ -26,8 +26,8 @@ extern int __syscall_sigaction (int, const struct old_kernel_sigaction *, struct old_kernel_sigaction *); -extern int __syscall_rt_sigaction (int, const struct sigaction *, - struct sigaction *, size_t); +extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *, + struct kernel_sigaction *, size_t); /* The variable is shared between all wrappers around signal handling functions which have RT equivalents. */ @@ -43,17 +43,41 @@ __sigaction (sig, act, oact) struct sigaction *oact; { struct old_kernel_sigaction k_sigact, k_osigact; - int error; + int result; /* First try the RT signals. */ if (!__libc_missing_rt_sigs) { + struct kernel_sigaction kact, koact; + + if (act) + { + kact.k_sa_handler = act->sa_handler; + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t)); + kact.sa_flags = act->sa_flags; +#ifdef HAVE_SA_RESTORER + kact.sa_restorer = act->sa_restorer; +#endif + } + /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ - int result = __syscall_rt_sigaction (sig, act, oact, _NSIG / 8); + result = __syscall_rt_sigaction (sig, act ? &kact : 0, + oact ? &koact : 0, _NSIG / 8); if (result >= 0 || errno != ENOSYS) - return result; + { + if (oact && result >= 0) + { + oact->sa_handler = koact.k_sa_handler; + memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t)); + oact->sa_flags = koact.sa_flags; +#ifdef HAVE_SA_RESTORER + oact->sa_restorer = koact.sa_restorer; +#endif + } + return result; + } __libc_missing_rt_sigs = 1; } @@ -67,9 +91,9 @@ __sigaction (sig, act, oact) k_sigact.sa_restorer = act->sa_restorer; #endif } - error = __syscall_sigaction (sig, act ? &k_sigact : 0, + result = __syscall_sigaction (sig, act ? &k_sigact : 0, oact ? &k_osigact : 0); - if (oact && error >= 0) + if (oact && result >= 0) { oact->sa_handler = k_osigact.k_sa_handler; oact->sa_mask.__val[0] = k_osigact.sa_mask; @@ -78,7 +102,7 @@ __sigaction (sig, act, oact) oact->sa_restorer = k_osigact.sa_restorer; #endif } - return error; + return result; } weak_alias (__sigaction, sigaction) |