713f07d90
Ron Yorston
2015-10-29
Subject
ash: fix error during recursive processing of here document
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c +3 -2shell/ash_test/ash-heredoc/heredoc3.right +1 -0shell/ash_test/ash-heredoc/heredoc3.tests +9 -0
shell/ash.c+3 -2
| @@ -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); | |
shell/ash_test/ash-heredoc/heredoc3.right+1 -0
| @@ -0,0 +1 @@ | |
| + | hello |
shell/ash_test/ash-heredoc/heredoc3.tests+9 -0
| @@ -0,0 +1,9 @@ | |
| + | echo hello >greeting |
| + | cat <<EOF && |
| + | $(cat greeting) |
| + | EOF |
| + | { |
| + | echo $? |
| + | cat greeting |
| + | } >/dev/null |
| + | rm greeting |