summary refs log tree commit diff
path: root/src/output.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2018-11-19 18:43:58 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2018-12-14 13:48:03 +0800
commit2c3ba509eb8117894d515e8fffc94aa099f38f8a (patch)
tree2381dd476f09ba063aefc26728c726930b2fe152 /src/output.c
parentexpand: Eat closing brace for length parameter expansion (diff)
downloaddash-2c3ba509eb8117894d515e8fffc94aa099f38f8a.tar.gz
dash-2c3ba509eb8117894d515e8fffc94aa099f38f8a.zip
parser: Do not push token back before parseheredoc
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@frippery.org>
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@gondor.apana.org.au>
Tested-by: Simon Ser <contact@emersion.fr>
Diffstat (limited to 'src/output.c')
0 files changed, 0 insertions, 0 deletions