From: Peter Stephenson <pws@csr.com>
To: zsh-workers@sunsite.dk
Subject: Re: Unexpected alias expansion in history list
Date: Mon, 11 Aug 2003 14:10:48 +0100 [thread overview]
Message-ID: <17910.1060607448@csr.com> (raw)
In-Reply-To: "Haakon Riiser"'s message of "Mon, 11 Aug 2003 00:19:07 +0200." <20030810221907.GA15013@s.chello.no>
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@csr.com> 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.
**********************************************************************
prev parent reply other threads:[~2003-08-11 13:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-08-10 22:19 Haakon Riiser
2003-08-11 13:10 ` Peter Stephenson [this message]
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=17910.1060607448@csr.com \
--to=pws@csr.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).