Re: Unexpected alias expansion in history list

[Peter Stephenson <pws@xxxxxxx>]

Haakon Riiser wrote:
> The following "bug" is probably not important, since it only
> happens in a syntactically illegal command, but I chose to report
> it anyway, in case the bug has other (more serious) symptomps.
> 
> Steps to reproduce:
> 
>   % zsh -f
>   % alias foo='foo bar'
>   % (foo) foo
>   zsh: parse error near `foo'
>   % history
>       1  alias foo='foo bar'
>       2  (foo) foo bar
>                ^^^^^^^

Actually, I think it's relatively harmless because it only shows up when
parsing output after an error.  However, I think we can get it right
quite easily, too.

Index: Src/hist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/hist.c,v
retrieving revision 1.45
diff -u -r1.45 hist.c
--- Src/hist.c	14 Jun 2002 17:52:05 -0000	1.45
+++ Src/hist.c	11 Aug 2003 13:08:12 -0000
@@ -290,6 +290,8 @@
 void
 herrflush(void)
 {
+    inpopalias();
+
     while (!lexstop && inbufct && !strin)
 	hwaddc(ingetc());
 }
Index: Src/input.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/input.c,v
retrieving revision 1.7
diff -u -r1.7 input.c
--- Src/input.c	17 Feb 2003 14:07:11 -0000	1.7
+++ Src/input.c	11 Aug 2003 13:08:13 -0000
@@ -549,3 +549,17 @@
 	inpoptop();
     } while (remcont);
 }
+
+/*
+ * Expunge any aliases from the input stack; they shouldn't appear
+ * in the history and need to be flushed explicitly when we encounter
+ * an error.
+ */
+
+/**/
+void
+inpopalias(void)
+{
+    while (inbufflags & INP_ALIAS)
+	inpoptop();
+}

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************