From: Peter Stephenson <pws@ibmth.df.unipi.it>
To: zsh-workers@sunsite.auc.dk (Zsh hackers list)
Subject: PATCH: pws-22: local traps addition
Date: Sun, 20 Jun 1999 14:25:28 +0200 [thread overview]
Message-ID: <9906201225.AA13796@ibmth.df.unipi.it> (raw)
Couple of things I missed: don't stick the old trap on the list if we're
not in a function, but do if we are in a function and all that does is
unset any existing trap.
--- Src/signals.c.st2 Fri Jun 18 15:38:35 1999
+++ Src/signals.c Sun Jun 20 14:22:48 1999
@@ -668,7 +668,7 @@
* one, to aid in removing this one. However, if there's
* already one at the current locallevel we just overwrite it.
*/
- if (isset(LOCALTRAPS) &&
+ if (isset(LOCALTRAPS) && locallevel &&
(!sigtrapped[sig] || locallevel > (sigtrapped[sig] >> ZSIG_SHIFT))) {
dosavetrap(sig, locallevel);
} else if (sigfuncs[sig])
@@ -709,6 +709,19 @@
if (sig == -1 || !(trapped = sigtrapped[sig]) ||
(jobbing && (sig == SIGTTOU || sig == SIGTSTP || sig == SIGTTIN))) {
return;
+ }
+ if (isset(LOCALTRAPS) && locallevel &&
+ sigtrapped[sig] && locallevel > (sigtrapped[sig] >> ZSIG_SHIFT)) {
+ /*
+ * This calls unsettrap recursively to do any dirty work, so
+ * make sure this bit doesn't happen: a bit messy, but hard
+ * to avoid.
+ */
+ int oldlt = opts[LOCALTRAPS];
+ opts[LOCALTRAPS] = 0;
+ dosavetrap(sig, locallevel);
+ opts[LOCALTRAPS] = oldlt;
+ return;
}
sigtrapped[sig] = 0;
if (sig == SIGINT && interact) {
--
Peter Stephenson <pws@ibmth.df.unipi.it> Tel: +39 050 844536
WWW: http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy
reply other threads:[~1999-06-20 12:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9906201225.AA13796@ibmth.df.unipi.it \
--to=pws@ibmth.df.unipi.it \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).