From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: [buglet] Ctrl+C and 'kill -s INT $$' should produce exit status 130
Date: Sun, 25 Sep 2016 18:56:11 +0100 [thread overview]
Message-ID: <20160925185611.02596fec@ntlworld.com> (raw)
In-Reply-To: <13e6db91-8ba9-8709-9708-5126ce882145@inlv.org>
On Tue, 20 Sep 2016 14:17:08 +0100
Martijn Dekker <martijn@inlv.org> wrote:
> On an interactive shell, sending SIGINT to the shell (which could be
> done with 'kill -s INT $$' or simply by pressing Ctrl+C) causes zsh to
> return to the command prompt with an exit status of 0, which represents
> a normal/successful exit. This should be 130, the exit status
> corresponding to SIGINT (128+2).
>
> % while :; do :; done
> ^C%
> % echo $? # should produce 130
> 0
> % kill -s INT $$; echo oops # no output produced, as expected
> % echo $? # should produce 130
> 0
It's fairly easy to do a bit better.
We could add an "intlastval" to test in the main loop before we reset
errflag, to use if ERRFLAG_INT is present. But I'm not sure if that's
worth it; with the current fix we remain sensitive to things we
shouldn't really be doing anyway on an interrupt.
pws
diff --git a/Src/exec.c b/Src/exec.c
index a5086c3..4e89340 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3701,7 +3701,8 @@ execcmd(Estate state, int input, int output, int how, int last1)
state->pc = opc;
}
dont_queue_signals();
- lastval = execbuiltin(args, assigns, (Builtin) hn);
+ if (!errflag)
+ lastval = execbuiltin(args, assigns, (Builtin) hn);
if (do_save & BINF_COMMAND)
errflag &= ~ERRFLAG_ERROR;
restore_queue_signals(q);
diff --git a/Src/signals.c b/Src/signals.c
index 30dde71..e2587dc 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -646,6 +646,7 @@ zhandler(int sig)
inerrflush();
check_cursh_sig(SIGINT);
}
+ lastval = 128 + SIGINT;
}
break;
prev parent reply other threads:[~2016-09-25 17:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 13:17 Martijn Dekker
2016-09-23 6:08 ` Daniel Shahaf
2016-09-25 17:56 ` Peter Stephenson [this message]
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=20160925185611.02596fec@ntlworld.com \
--to=p.w.stephenson@ntlworld.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).