39c39
< * $Id: kern_sig.c,v 1.55 1999/04/28 11:36:59 phk Exp $
---
> * $Id: kern_sig.c,v 1.56 1999/05/03 23:57:22 billf Exp $
129,130d128
< sa->sa_handler = ps->ps_sigact[signum];
< sa->sa_mask = ps->ps_catchmask[signum];
131a130,135
> if ((ps->ps_siginfo & bit) != 0)
> sa->sa_sigaction =
> (__siginfohandler_t *)ps->ps_sigact[signum];
> else
> sa->sa_handler = ps->ps_sigact[signum];
> sa->sa_mask = ps->ps_catchmask[signum];
140a145,146
> if ((ps->ps_siginfo & bit) != 0)
> sa->sa_flags |= SA_SIGINFO;
154c160
< sa->sa_handler != SIG_DFL)
---
> ps->ps_sigact[signum] != SIG_DFL)
175d180
< ps->ps_sigact[signum] = sa->sa_handler;
176a182,188
> if (sa->sa_flags & SA_SIGINFO) {
> ps->ps_sigact[signum] = sa->sa_handler;
> ps->ps_siginfo |= bit;
> } else {
> ps->ps_sigact[signum] = (__sighandler_t *)sa->sa_sigaction;
> ps->ps_siginfo &= ~bit;
> }
224,225c236,237
< if (sa->sa_handler == SIG_IGN ||
< (sigprop[signum] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
---
> if (ps->ps_sigact[signum] == SIG_IGN ||
> (sigprop[signum] & SA_IGNORE && ps->ps_sigact[signum] == SIG_DFL)) {
232c244
< if (sa->sa_handler == SIG_DFL)
---
> if (ps->ps_sigact[signum] == SIG_DFL)
389a402,403
> if ((ps->ps_siginfo & bit) != 0)
> sv->sv_flags |= SV_SIGINFO;