From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 108 invoked from network); 19 Sep 2004 18:26:50 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 19 Sep 2004 18:26:50 -0000 Received: (qmail 68059 invoked from network); 19 Sep 2004 18:26:43 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 19 Sep 2004 18:26:43 -0000 Received: (qmail 20963 invoked by alias); 19 Sep 2004 18:26:32 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20387 Received: (qmail 20948 invoked from network); 19 Sep 2004 18:26:31 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 19 Sep 2004 18:26:31 -0000 Received: (qmail 67800 invoked from network); 19 Sep 2004 18:26:31 -0000 Received: from moonbase.zanshin.com (64.84.47.139) by a.mx.sunsite.dk with SMTP; 19 Sep 2004 18:26:29 -0000 Received: from toltec.zanshin.com (toltec.zanshin.com [64.84.47.166]) by moonbase.zanshin.com (8.13.1/8.13.1) with ESMTP id i8JIQSJs009638 for ; Sun, 19 Sep 2004 11:26:28 -0700 Date: Sun, 19 Sep 2004 11:26:28 -0700 (PDT) From: Bart Schaefer Reply-To: zsh-workers@sunsite.dk To: zsh-workers@sunsite.dk Subject: Re: PATCH: exit after 10 EOF's In-Reply-To: <20040919175211.3557D863A@pwstephenson.fsnet.co.uk> Message-ID: References: <200409131118.i8DBIM5B005245@news01.csr.com> <20040919175211.3557D863A@pwstephenson.fsnet.co.uk> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=-0.0 required=6.0 tests=BAYES_44 autolearn=no version=2.63 X-Spam-Hits: -0.0 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))