diff options
| -rw-r--r-- | shell/ash.c | 5 | ||||
| -rw-r--r-- | shell/ash_test/ash-heredoc/heredoc3.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-heredoc/heredoc3.tests | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 0d7cac0..384c7b9 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -11899,6 +11899,7 @@ static int readtoken(void) { int t; + int kwd = checkkwd; #if DEBUG smallint alreadyseen = tokpushback; #endif @@ -11912,7 +11913,7 @@ readtoken(void) /* * eat newlines */ - if (checkkwd & CHKNL) { + if (kwd & CHKNL) { while (t == TNL) { parseheredoc(); t = xxreadtoken(); @@ -11926,7 +11927,7 @@ readtoken(void) /* * check for keywords */ - if (checkkwd & CHKKWD) { + if (kwd & CHKKWD) { const char *const *pp; pp = findkwd(wordtext); diff --git a/shell/ash_test/ash-heredoc/heredoc3.right b/shell/ash_test/ash-heredoc/heredoc3.right new file mode 100644 index 0000000..ce01362 --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc3.right @@ -0,0 +1 @@ +hello diff --git a/shell/ash_test/ash-heredoc/heredoc3.tests b/shell/ash_test/ash-heredoc/heredoc3.tests new file mode 100755 index 0000000..96c227c --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc3.tests @@ -0,0 +1,9 @@ +echo hello >greeting +cat <<EOF && +$(cat greeting) +EOF +{ + echo $? + cat greeting +} >/dev/null +rm greeting |