summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/__longjmp.S7
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h8
-rw-r--r--sysdeps/unix/sysv/linux/i386/sigaction.c31
-rw-r--r--sysdeps/unix/sysv/linux/kernel_sigaction.h9
-rw-r--r--sysdeps/unix/sysv/linux/sigaction.c40
5 files changed, 72 insertions, 23 deletions
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index 7e039deb8f..a8049e9de3 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -1,5 +1,5 @@
/* longjmp for i386.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998 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
@@ -25,6 +25,8 @@
ENTRY (__longjmp)
movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */
movl 8(%esp), %eax /* Second argument is return value. */
+ /* Save the return address now. */
+ movl (JB_PC*4)(%ecx), %edx
/* Restore registers. */
movl (JB_BX*4)(%ecx), %ebx
movl (JB_SI*4)(%ecx), %esi
@@ -32,6 +34,5 @@ ENTRY (__longjmp)
movl (JB_BP*4)(%ecx), %ebp
movl (JB_SP*4)(%ecx), %esp
/* Jump to saved PC. */
- movl (JB_PC*4)(%ecx), %ecx
- jmp *%ecx
+ jmp *%edx
END (__longjmp)
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h b/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h
index f8c42e0a1e..4c35d969cf 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 6e26a5e6e2..a6d2b63634 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 e3901cfe5c..1ce2be20a1 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 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)
View Lorry Controller Status