about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2019-05-13 09:55:01 +0100
committerPeter Stephenson <p.stephenson@samsung.com>2019-05-13 09:55:01 +0100
commit95211f87ed04fff74475109d36027b5a24a71ab9 (patch)
treec3b3ac4ba27c96214e6e30cb0bd1f2e0ef9a1163
parentcebec8926a31db3ed2dccca7d2b317ac8baa6afc (diff)
downloadzsh-95211f87ed04fff74475109d36027b5a24a71ab9.tar.gz
zsh-95211f87ed04fff74475109d36027b5a24a71ab9.tar.xz
zsh-95211f87ed04fff74475109d36027b5a24a71ab9.zip
44259: Ensure we can set signals to default even if ignored.
Previously the shell didn't take account of signals marked as

ignored on entry, which was inconsistent with other behaviour.
-rw-r--r--ChangeLog5
-rw-r--r--Src/signals.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 979327c70..da6de05f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-13  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 44259: Src/signals.c: Ensure we can set signal to default
+	even if it was ignored on entry to the shell.
+
 2019-05-08  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 	* 44279: Completion/BSD/Command/_cu, Completion/BSD/Command/_gstat,
diff --git a/Src/signals.c b/Src/signals.c
index f294049c2..14218177a 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -1011,10 +1011,6 @@ removetrap(int sig)
 	(!trapped || locallevel > (sigtrapped[sig] >> ZSIG_SHIFT)))
 	dosavetrap(sig, locallevel);
 
-    if (!trapped) {
-	unqueue_signals();
-        return NULL;
-    }
     if (sigtrapped[sig] & ZSIG_TRAPPED)
 	nsigtrapped--;
     sigtrapped[sig] = 0;