From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@sunsite.dk
Subject: Re: PATCH: exit after 10 EOF's
Date: Sun, 19 Sep 2004 11:26:28 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.61.0409191119580.6971@toltec.zanshin.com> (raw)
In-Reply-To: <20040919175211.3557D863A@pwstephenson.fsnet.co.uk>
On Sun, 19 Sep 2004, Peter Stephenson wrote:
> Bart Schaefer wrote:
> >
> > You may have hit on the solution. Rather than counting the number of EOF
> > key presses, count the number of warnings printed.
>
> Yes, that sounds OK. If we could somehow make it (without too much
> tortuous code) that any zle -N widget, no matter what it contains,
> suppresses the warning and the EOF behaviour, I would be fairly happy.
I haven't gotten to the latter part yet, but here's a patch that (a) backs
out 20363 and (b) causes the count to apply to printing of the warning.
The actual implementation is that, with ignoreeof set, ZLE pretends it
received an EOF only when it also prints a warning about it. The counter
in the toplevel loop then suffices and we don't have to count warnings.
> My main remaining unhappiness is with the structure of the code, which
> is why the message and the exiting are separate as patched; the same
> test occurs in two places (not counting the main loop in the main
> shell). However, maybe that can be fixed, too.
Well, sort of. See what you think.
Index: Src/init.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/init.c,v
retrieving revision 1.43
diff -u -r1.43 init.c
--- Src/init.c 13 Sep 2004 13:04:55 -0000 1.43
+++ Src/init.c 19 Sep 2004 18:24:52 -0000
@@ -37,7 +37,7 @@
#include "version.h"
/**/
-mod_export int noexitct = 0;
+int noexitct = 0;
/* buffer for $_ and its length */
Index: Src/Zle/zle_main.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_main.c,v
retrieving revision 1.51
diff -u -r1.51 zle_main.c
--- Src/Zle/zle_main.c 13 Sep 2004 13:04:55 -0000 1.51
+++ Src/Zle/zle_main.c 19 Sep 2004 18:24:52 -0000
@@ -688,30 +688,23 @@
selectlocalmap(NULL);
bindk = getkeycmd();
if (bindk) {
- if (!ll && isfirstln && lastchar == eofchar) {
+ if (!ll && isfirstln && !(zlereadflags & ZLRF_IGNOREEOF) &&
+ lastchar == eofchar) {
/*
* Slight hack: this relies on getkeycmd returning
* a value for the EOF character. However,
* undefined-key is fine. That's necessary because
* otherwise we can't distinguish this case from
* a ^C.
- *
- * The noxitct test is done in the top-level loop
- * if zle is not running. As we trap EOFs at this
- * level inside zle we need to mimic it here.
- * If we break, the top-level loop will actually increment
- * noexitct an extra time; that doesn't cause any
- * problems.
*/
- if (!(zlereadflags & ZLRF_IGNOREEOF) ||
- ++noexitct >= 10)
- {
- eofsent = 1;
- break;
- }
+ eofsent = 1;
+ break;
}
- if (execzlefunc(bindk, zlenoargs))
+ if (execzlefunc(bindk, zlenoargs)) {
handlefeep(zlenoargs);
+ if (eofsent)
+ break;
+ }
handleprefixes();
/* for vi mode, make sure the cursor isn't somewhere illegal */
if (invicmdmode() && cs > findbol() &&
@@ -908,6 +901,7 @@
!ll && isfirstln && (zlereadflags & ZLRF_IGNOREEOF)) {
showmsg((!islogin) ? "zsh: use 'exit' to exit." :
"zsh: use 'logout' to logout.");
+ eofsent = 1;
ret = 1;
} else {
if(!(wflags & ZLE_KEEPSUFFIX))
next prev parent reply other threads:[~2004-09-19 18:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-13 11:18 Peter Stephenson
2004-09-13 17:51 ` Bart Schaefer
2004-09-15 9:46 ` Peter Stephenson
2004-09-15 15:43 ` Bart Schaefer
2004-09-15 16:02 ` Bart Schaefer
2004-09-15 16:14 ` Peter Stephenson
2004-09-16 14:57 ` Peter Stephenson
2004-09-16 16:12 ` Bart Schaefer
2004-09-16 16:28 ` Peter Stephenson
2004-09-19 6:50 ` Bart Schaefer
2004-09-19 7:45 ` Duncan Sinclair
2004-09-19 16:41 ` Bart Schaefer
2004-09-19 17:52 ` Peter Stephenson
2004-09-19 18:26 ` Bart Schaefer [this message]
2004-09-19 19:25 ` Bart Schaefer
2004-09-20 10:15 ` Peter Stephenson
2004-09-20 13:59 ` Peter Stephenson
2004-09-20 14:43 ` Bart Schaefer
2004-09-20 14:53 ` Peter Stephenson
2004-09-19 19:11 ` Bart Schaefer
2004-09-19 11:53 ` Peter Stephenson
2004-09-19 17:00 ` 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=Pine.LNX.4.61.0409191119580.6971@toltec.zanshin.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@sunsite.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).