On Monday, November 19, 2018 11:43 AM, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > Sorry for the repost, I'm trying to get this into patchwork. > > ---8<--- > When we read the first token in list() we use peektoken instead > of readtoken as the following code needs to use the same token > again. However, this is wrong when we're in a here-document as > it will clobber the saved token without resetting the tokpushback > flag. > > This patch fixes it by doing the tokpushback after parseheredoc > and setting lasttoken again if parseheredoc was called. > > Reported-by: Ron Yorston <rmy@xxxxxxxxxxxx> > Fixes: 7c245aa8ed33 ("[PARSER] Simplify EOF/newline handling in...") > Fixes: ee5cbe9fd6bc ("[SHELL] Optimize dash -c "command" to avoid a fork") > Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> This works for me. Tested-by: Simon Ser <contact@xxxxxxxxxxx> Thanks!