From 13c6a86f0dcd34332b35ebce9ac21b01aa9ad815 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 27 Dec 2007 13:57:07 +1100 Subject: [PARSER] Do not show prompts in expandstr Once I fixed the previous problem it became apparent that we never dealt with prompts with new-lines in them correctly. The problem is that we showed a secondary prompt for each of them. This patch disables prompt generation in expandstr. Signed-off-by: Herbert Xu --- ChangeLog | 1 + src/parser.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8b392f4..0030738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2007-12-27 Herbert Xu * Add FAKEEOFMARK for expandstr. + * Do not show prompts in expandstr. 2007-12-23 Gerrit Pape diff --git a/src/parser.c b/src/parser.c index 3206328..9dd6185 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1499,10 +1499,18 @@ const char * expandstr(const char *ps) { union node n; + int saveprompt; /* XXX Fix (char *) cast. */ setinputstring((char *)ps); + + saveprompt = doprompt; + doprompt = 0; + readtoken1(pgetc(), DQSYNTAX, FAKEEOFMARK, 0); + + doprompt = saveprompt; + popfile(); n.narg.type = NARG; -- cgit 1.4.1