From 709ce3829cb1c7bfeade8b18b39cd601b9e0decc Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Sat, 3 Jun 2000 16:26:47 +0000 Subject: 11736: Fix TRAPEXIT scoping. --- ChangeLog | 4 ++++ Src/signals.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2b830ac6c..271c54888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-06-03 Bart Schaefer + + * 11736: Src/signals.c: Fix special scoping of TRAPEXIT. + 2000-06-02 Peter Stephenson * 11733: Doc/Makefile.in: Solaris sed was behaving strangely with diff --git a/Src/signals.c b/Src/signals.c index b8e06d444..9b9ef97aa 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -751,7 +751,7 @@ removetrap(int sig) * one, to aid in removing this one. However, if there's * already one at the current locallevel we just overwrite it. */ - if (isset(LOCALTRAPS) && locallevel && + if ((isset(LOCALTRAPS) || sig == SIGEXIT) && locallevel && (!trapped || locallevel > (sigtrapped[sig] >> ZSIG_SHIFT))) dosavetrap(sig, locallevel); -- cgit 1.4.1