From: Mikael Magnusson <mikachu@gmail.com>
To: Peter Stephenson <p.stephenson@samsung.com>
Cc: "Zsh Hackers' List" <zsh-workers@zsh.org>
Subject: Re: Interrupting globs (Re: Something rotten in tar completion)
Date: Mon, 8 Dec 2014 13:43:11 +0100 [thread overview]
Message-ID: <CAHYJk3Qc1ELRbJAd2f5Y9Po2EeNev2B-NJHjGZiBjkSZ6J7Crw@mail.gmail.com> (raw)
In-Reply-To: <20141208111806.5cd1ced5@pwslap01u.europe.root.pri>
On Mon, Dec 8, 2014 at 12:18 PM, Peter Stephenson
<p.stephenson@samsung.com> wrote:
> On Sun, 7 Dec 2014 17:19:20 +0000
> Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
>> diff --git a/Src/jobs.c b/Src/jobs.c
>> index 6e47e5e..3c2a21a 100644
>> --- a/Src/jobs.c
>> +++ b/Src/jobs.c
>> @@ -1444,7 +1444,19 @@ zwaitjob(int job, int wait_cmd)
>> restore_queue_signals(q);
>> return 128 + last_signal;
>> }
>> - errflag &= ~ERRFLAG_ERROR;
>> +/*...*/
>> + errflag = 0; */
>> +
>> if (subsh) {
>> killjb(jn, SIGCONT);
>> jn->stat &= ~STAT_STOPPED;
>
> Aha! Spotted when trying out TRY_BLOCK_INTERRUPT.
>
> I only switched ERRFLAG_ERROR to ERRFLAG_INT when the shell *itself*
> gets the interrupt. The case here, and in the test I was running, is
> where we propagate a SIGINT detected by WTERMSIGing (er, that's a verb,
> right?) a process that exited because it received the ^C (and the shell
> wasn't part of the foreground process group).
>
> The following patch (applicable to the interrupt_abort branch) makes
> TRY_BLOCK_INTERRUPT do sensible things in that case. Needless to say I
> haven't dared back off the patch quoted above again...
>
> By the way, the cases below already handle SIGINT and SIGQUIT in
> parallel, which suggest the code I added to do this for mimicking signals
> on return from a trap is at least consistent.
(Since this is maybe a little known feature of git, :/foo is the first
reachable commit on any branch with the string foo in the commit name,
you can literally say
git revert :/'this is a very good solution with no drawbacks'
).
Good news and bad news, with this latest patch, I can revert :/'Put
back commenting' and still ctrl-c out of cd ../linux in one go, BUT,
when I do, with or without the revert, it immediately puts me back at
the prompt without executing preexec().
Test case for you guys:
% zsh -f
% precmd() echo yes
% sleep 2; echo no
^C
yes
With :/'Ensure propagation' and :/'Put back' (eg, current tip of
interrupt_abort), I get neither printed.
Reverting :/'Put back' still gets me neither (ie, it makes no
difference, which I guess is the goal of this, so yay?).
With both reverted, I get what I originally reported (obviously)
^C
no
yes
With only :/'Ensure propagation' reverted (eg, at the previous tip), I get
^C
yes
So I guess some other place needs to clear interrupts as well, or the
"return to commandline" clear should be before precmd being called?
(If that's nonsense it's because I haven't looked at the code for that
at all).
--
Mikael Magnusson
next prev parent reply other threads:[~2014-12-08 12:43 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 15:54 Something rotten in tar completion Peter Stephenson
2014-12-02 16:48 ` Bart Schaefer
2014-12-02 17:26 ` Peter Stephenson
2014-12-04 16:56 ` Bart Schaefer
2014-12-04 17:12 ` Peter Stephenson
2014-12-05 8:20 ` Interrupting globs (Re: Something rotten in tar completion) Bart Schaefer
2014-12-05 14:17 ` Jérémie Roquet
2014-12-06 21:50 ` Bart Schaefer
2014-12-06 22:15 ` Bart Schaefer
2014-12-05 14:50 ` Peter Stephenson
2014-12-05 15:14 ` Jérémie Roquet
[not found] ` <22084.1417791853@thecus.kiddle.eu>
2014-12-05 15:29 ` Peter Stephenson
2014-12-05 17:03 ` Peter Stephenson
2014-12-05 17:53 ` Peter Stephenson
2014-12-05 18:06 ` Bart Schaefer
2014-12-05 18:13 ` Peter Stephenson
2014-12-05 20:34 ` Peter Stephenson
2014-12-05 22:07 ` Peter Stephenson
2014-12-06 0:32 ` Ray Andrews
2014-12-06 22:27 ` Bart Schaefer
2014-12-06 22:57 ` Ray Andrews
2014-12-06 0:36 ` Mikael Magnusson
2014-12-06 0:40 ` Mikael Magnusson
2014-12-06 22:31 ` Bart Schaefer
2014-12-06 0:52 ` Mikael Magnusson
2014-12-06 11:49 ` Mikael Magnusson
2014-12-06 17:48 ` Bart Schaefer
2014-12-07 1:42 ` Mikael Magnusson
2014-12-07 4:45 ` Bart Schaefer
2014-12-07 5:04 ` Bart Schaefer
2014-12-07 17:39 ` Peter Stephenson
2014-12-07 22:59 ` Mikael Magnusson
2014-12-07 5:18 ` Bart Schaefer
2014-12-07 17:07 ` Peter Stephenson
2014-12-07 17:19 ` Peter Stephenson
2014-12-08 11:18 ` Peter Stephenson
2014-12-08 12:43 ` Mikael Magnusson [this message]
2014-12-08 13:03 ` Peter Stephenson
2014-12-08 15:51 ` Mikael Magnusson
2014-12-08 16:41 ` Bart Schaefer
2014-12-07 17:37 ` Oliver Kiddle
2014-12-07 18:18 ` Peter Stephenson
2014-12-07 18:34 ` Bart Schaefer
2014-12-07 18:59 ` Peter Stephenson
2014-12-07 19:58 ` Bart Schaefer
2014-12-08 10:01 ` Peter Stephenson
2014-12-07 20:20 ` Peter Stephenson
2014-12-07 20:54 ` Bart Schaefer
2014-12-07 20:03 ` Peter Stephenson
2014-12-07 5:59 ` Bart Schaefer
2014-12-07 7:15 ` Mikael Magnusson
2014-12-07 16:21 ` Peter Stephenson
2014-12-07 23:01 ` Interrupts in completion, traps in _main_complete Bart Schaefer
2014-12-08 20:27 ` Peter Stephenson
2014-12-09 4:43 ` Bart Schaefer
2014-12-09 11:26 ` Peter Stephenson
2014-12-09 11:50 ` Peter Stephenson
2014-12-09 21:09 ` Peter Stephenson
2014-12-10 10:02 ` interrupt_abort incorporation Peter Stephenson
2014-12-11 10:00 ` Peter Stephenson
2014-12-04 17:24 ` Something rotten in tar completion Bart Schaefer
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=CAHYJk3Qc1ELRbJAd2f5Y9Po2EeNev2B-NJHjGZiBjkSZ6J7Crw@mail.gmail.com \
--to=mikachu@gmail.com \
--cc=p.stephenson@samsung.com \
--cc=zsh-workers@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).