From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-users@zsh.org
Subject: Re: process substitution and Ctrl-C
Date: Thu, 19 Aug 2010 21:18:53 +0100 [thread overview]
Message-ID: <20100819211853.33d720d8@pws-pc> (raw)
In-Reply-To: <20100819181556.4a3e6589@csr.com>
I'm now wondering if we should do the same in the case where the shell
actually does get the SIGINT and abort processing as a result? Theories
welcome.
Index: Src/jobs.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/jobs.c,v
retrieving revision 1.78
diff -p -u -r1.78 jobs.c
--- Src/jobs.c 18 Aug 2010 21:21:17 -0000 1.78
+++ Src/jobs.c 19 Aug 2010 20:16:53 -0000
@@ -320,6 +320,36 @@ update_process(Process pn, int status)
}
#endif
+/*
+ * Called when the current shell is behaving as if it received
+ * a interactively generated signal (sig).
+ *
+ * As we got the signal or are pretending we did, we need to pretend
+ * anything attached to a CURSH process got it, too.
+ */
+/**/
+void
+check_cursh_sig(int sig)
+{
+ int i, j;
+
+ if (!errflag)
+ return;
+ for (i = 1; i <= maxjob; i++) {
+ if ((jobtab[i].stat & (STAT_CURSH|STAT_DONE)) ==
+ STAT_CURSH) {
+ for (j = 0; j < 2; j++) {
+ Process pn = j ? jobtab[i].auxprocs : jobtab[i].procs;
+ for (; pn; pn = pn->next) {
+ if (pn->status == SP_RUNNING) {
+ kill(pn->pid, sig);
+ }
+ }
+ }
+ }
+ }
+}
+
/* Update status of job, possibly printing it */
/**/
@@ -496,6 +526,7 @@ update_job(Job jn)
breaks = loops;
errflag = 1;
}
+ check_cursh_sig(sig);
}
}
}
Index: Src/signals.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/signals.c,v
retrieving revision 1.58
diff -p -u -r1.58 signals.c
--- Src/signals.c 12 May 2010 10:07:01 -0000 1.58
+++ Src/signals.c 19 Aug 2010 20:16:53 -0000
@@ -580,6 +580,7 @@ zhandler(int sig)
breaks = loops;
errflag = 1;
inerrflush();
+ check_cursh_sig(SIGINT);
}
}
break;
--
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/
next prev parent reply other threads:[~2010-08-19 20:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-19 12:41 Vincent Lefevre
2010-08-19 13:07 ` Peter Stephenson
2010-08-19 17:15 ` Peter Stephenson
2010-08-19 20:18 ` Peter Stephenson [this message]
2010-08-19 15:32 ` Bart Schaefer
2010-08-19 20:37 ` Peter Stephenson
2010-08-19 21:17 ` Vincent Lefevre
2010-08-20 8:19 ` Bart Schaefer
2010-08-20 11:52 ` Vincent Lefevre
2010-08-20 15:24 ` Bart Schaefer
2010-08-21 0:04 ` Vincent Lefevre
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=20100819211853.33d720d8@pws-pc \
--to=p.w.stephenson@ntlworld.com \
--cc=zsh-users@zsh.org \
/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).