diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-09-26 18:51:48 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-09-26 18:51:48 +0400 |
| commit | d5f4ee62b706f7cfe22a92fd796dc36382690950 (patch) | |
| tree | cde2c46f08aab9c699af1a2d3d8f57e5ba1ead60 /winsup/cygwin/exceptions.cc | |
| parent | 683cc8189ce70bb5f33bec465eebad6effc9bd36 (diff) | |
* exceptions.cc (handle_exceptions): Just si_code to SI_KERNEL first and let it
be overridden.
* exceptions.cc (_cygtls::call_signal_handler): Call signal handler with extra
siginfo_t * and void * parameters when SA_SIGINFO flag is set.
* signal.cc (signal): Clear SA_SIGINFO flag.
(sigqueue): Fix incorrect setting of si_code.
* sigproc.cc (signal_fixup_after_exec): Clear SA_SIGINFO flag when setting
handler to SIG_DFL.
Diffstat (limited to 'winsup/cygwin/exceptions.cc')
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index bc0d31c7f..32d4b6d7e 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -424,6 +424,7 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *) CONTEXT in = *in0; siginfo_t si; + si.si_code = SI_KERNEL; /* Coerce win32 value to posix value. */ switch (e.ExceptionCode) { @@ -472,7 +473,6 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *) case STATUS_TIMEOUT: si.si_signo = SIGALRM; - si.si_code = 0; break; case STATUS_ACCESS_VIOLATION: @@ -489,7 +489,6 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *) case STATUS_CONTROL_C_EXIT: si.si_signo = SIGINT; - si.si_code = 0; break; case STATUS_INVALID_HANDLE: @@ -569,8 +568,6 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *) me.return_from_fault (); si.si_addr = ebp; - if (!si_code) - si.si_code = SI_KERNEL; si.si_errno = si.si_pid = si.si_uid = 0; me.push ((__stack_t) ebp, true); sig_send (NULL, si, &me); // Signal myself @@ -1253,7 +1250,15 @@ _cygtls::call_signal_handler () int this_errno = saved_errno; incyg--; sig = 0; - sigfunc (thissig); + if (this_sa_flags & SA_SIGINFO == 0) + sigfunc (thissig); + else + { + siginfo_t thissi = infodata; + void (*sigact) (int, siginfo_t *, void *) = (void (*) (int, siginfo_t *, void *)) func; + /* no ucontext_t information provided yet */ + sigact (thissig, &thissi, NULL); + } incyg++; set_signal_mask (this_oldmask, myself->getsigmask ()); if (this_errno >= 0) |