From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12143 invoked from network); 13 Sep 2004 11:19:34 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 13 Sep 2004 11:19:34 -0000 Received: (qmail 4588 invoked from network); 13 Sep 2004 11:19:28 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 13 Sep 2004 11:19:28 -0000 Received: (qmail 9026 invoked by alias); 13 Sep 2004 11:19:26 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20363 Received: (qmail 9015 invoked from network); 13 Sep 2004 11:19:26 -0000 Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 13 Sep 2004 11:19:26 -0000 Received: (qmail 1506 invoked from network); 13 Sep 2004 11:18:26 -0000 Received: from lhuumrelay3.lnd.ops.eu.uu.net (62.189.58.19) by a.mx.sunsite.dk with SMTP; 13 Sep 2004 11:18:25 -0000 Received: from MAILSWEEPER01.csr.com (mailhost1.csr.com [62.189.183.235]) by lhuumrelay3.lnd.ops.eu.uu.net (8.11.0/8.11.0) with ESMTP id i8DBINv02224 for ; Mon, 13 Sep 2004 11:18:23 GMT Received: from EXCHANGE02.csr.com (unverified [192.168.137.45]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Mon, 13 Sep 2004 12:17:29 +0100 Received: from news01.csr.com ([192.168.143.38]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Mon, 13 Sep 2004 12:19:33 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.12.11/8.12.11) with ESMTP id i8DBIMB5005248 for ; Mon, 13 Sep 2004 12:18:23 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.12.11/8.12.11/Submit) with ESMTP id i8DBIM5B005245 for ; Mon, 13 Sep 2004 12:18:22 +0100 Message-Id: <200409131118.i8DBIM5B005245@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: exit after 10 EOF's Date: Mon, 13 Sep 2004 12:18:22 +0100 From: Peter Stephenson X-OriginalArrivalTime: 13 Sep 2004 11:19:33.0764 (UTC) FILETIME=[8BC0A440:01C49983] 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=none autolearn=no version=2.63 X-Spam-Hits: 0.0 The shell is supposed to exit after 10 EOFs if ignore_eof is set. When zle is in use this appears to have been broken for a long time. (It's not affected by my recent patch for aborting a list causing the shell to exit, even though that touched the same code.) I think the following patch is OK. It duplicates the usual test from the top-level loop inside zle, but if we're going to continue with the feature that the "use 'exit' to exit" message is handled as a zle message (which doesn't cause a new command line to be output) that seems to be inevitable. This ought to be part of the test suite, but with zle it needs zpty and I don't understand the tests with zpty. Index: Src/init.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/init.c,v retrieving revision 1.42 diff -u -r1.42 init.c --- Src/init.c 11 Jul 2004 22:53:03 -0000 1.42 +++ Src/init.c 13 Sep 2004 11:12:47 -0000 @@ -37,7 +37,7 @@ #include "version.h" /**/ -int noexitct = 0; +mod_export 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.50 diff -u -r1.50 zle_main.c --- Src/Zle/zle_main.c 2 Sep 2004 09:20:39 -0000 1.50 +++ Src/Zle/zle_main.c 13 Sep 2004 11:12:48 -0000 @@ -688,17 +688,27 @@ selectlocalmap(NULL); bindk = getkeycmd(); if (bindk) { - if (!ll && isfirstln && !(zlereadflags & ZLRF_IGNOREEOF) && - lastchar == eofchar) { + if (!ll && isfirstln && 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. */ - eofsent = 1; - break; + if (!(zlereadflags & ZLRF_IGNOREEOF) || + ++noexitct >= 10) + { + eofsent = 1; + break; + } } if (execzlefunc(bindk, zlenoargs)) handlefeep(zlenoargs); -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com **********************************************************************