PATCH: exit after 10 EOF's

[Peter Stephenson <pws@xxxxxxx>]

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 <pws@xxxxxxx>                  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
**********************************************************************