about summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Paulson <epaulson10@gmail.com>2021-06-07 10:27:53 -0700
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2021-07-23 21:08:13 +0100
commitf8ec33c453159ad848d9b1a28782c5df7f0cc944 (patch)
treed80b01df5244e0cd1c7d05dd1a193c6a07e8e9d0
parent50dc7f29131b668daaa82c02a826763e6e9a3a44 (diff)
downloadzsh-f8ec33c453159ad848d9b1a28782c5df7f0cc944.tar.gz
zsh-f8ec33c453159ad848d9b1a28782c5df7f0cc944.tar.xz
zsh-f8ec33c453159ad848d9b1a28782c5df7f0cc944.zip
49029: Prevent shell from sending duplicate signals with MONITOR
-rw-r--r--ChangeLog3
-rw-r--r--Src/signals.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b0f838d5c..d36a6970e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2021-07-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Erik Paulson: 49029: Src/signals.c: Remove additional copies
+	of signals sent by zsh with MONITOR enabled.
+
 	* 49182: Src/hist.c, Src/lex.c: Interactive word correction
 	doesn't work inside command substitution, so don't try to do it.
 
diff --git a/Src/signals.c b/Src/signals.c
index 2c540f38f..5c787e2a8 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -810,6 +810,7 @@ killjb(Job jn, int sig)
 	    err = killpg(jn->gleader, sig);
 	    if (sig == SIGCONT && err != -1)
 		makerunning(jn);
+	    return err;
 	}
     }
     for (pn = jn->procs; pn; pn = pn->next) {