diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sigaction.c | 31 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel_sigaction.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigaction.c | 40 |
4 files changed, 68 insertions, 20 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h b/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h index f8c42e0..4c35d96 100644 --- a/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h +++ b/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h @@ -5,3 +5,11 @@ struct old_kernel_sigaction { unsigned long sa_mask; unsigned int sa_flags; }; + +/* This is the sigaction structure from the Linux 2.1.68 kernel. */ + +struct kernel_sigaction { + __sighandler_t k_sa_handler; + unsigned int sa_flags; + sigset_t sa_mask; +}; diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/sigaction.c index 6e26a5e..a6d2b63 100644 --- a/sysdeps/unix/sysv/linux/i386/sigaction.c +++ b/sysdeps/unix/sysv/linux/i386/sigaction.c @@ -28,8 +28,8 @@ #include <kernel_sigaction.h> -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. */ @@ -47,27 +47,34 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact) /* First try the RT signals. */ if (!__libc_missing_rt_sigs) { - struct sigaction nact, *nactp; + struct kernel_sigaction kact, koact; if (act) { - nact.sa_handler = act->sa_handler; - memcpy (&nact.sa_mask, &act->sa_mask, sizeof (sigset_t)); - nact.sa_flags = act->sa_flags; + kact.k_sa_handler = act->sa_handler; + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t)); + kact.sa_flags = act->sa_flags; - nact.sa_restorer = ((act->sa_flags & SA_NOMASK) + kact.sa_restorer = ((act->sa_flags & SA_NOMASK) ? &&restore_nomask : &&restore); - nactp = &nact; } - else - nactp = NULL; /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ - result = __syscall_rt_sigaction (sig, nactp, oact, _NSIG / 8); + result = __syscall_rt_sigaction (sig, act ? &kact : NULL, + oact ? &koact : NULL, _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; + oact->sa_restorer = koact.sa_restorer; + } + return result; + } __libc_missing_rt_sigs = 1; } diff --git a/sysdeps/unix/sysv/linux/kernel_sigaction.h b/sysdeps/unix/sysv/linux/kernel_sigaction.h index e3901cf..1ce2be2 100644 --- a/sysdeps/unix/sysv/linux/kernel_sigaction.h +++ b/sysdeps/unix/sysv/linux/kernel_sigaction.h @@ -8,3 +8,12 @@ struct old_kernel_sigaction { unsigned long sa_flags; void (*sa_restorer) __P ((void)); }; + +/* This is the sigaction structure from the Linux 2.1.68 kernel. */ + +struct kernel_sigaction { + __sighandler_t k_sa_handler; + unsigned long sa_flags; + void (*sa_restorer) __P ((void)); + sigset_t sa_mask; +}; diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c index 510cbe7..5f9a7fe 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) |