bb6f573ad
Denys Vlasenko
2018-04-01
Subject
hush: add a comment where we differ from bash wrt heredoc EOF mark handling
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c +8 -0shell/hush_test/hush-heredoc/heredoc_backquote1.right +0 -5shell/hush_test/hush-heredoc/heredoc_backquote1.tests +0 -10
shell/hush.c+8 -0
| @@ -3861,6 +3861,13 @@ static int done_word(o_string *word, struct parse_context *ctx) | |
| * shell may perform it, but shall do so only when | |
| * the expansion would result in one word." | |
| */ | |
| + | //bash does not do parameter/command substitution or arithmetic expansion |
| + | //for _heredoc_ redirection word: these constructs look for exact eof marker |
| + | // as written: |
| + | // <<EOF$t |
| + | // <<EOF$((1)) |
| + | // <<EOF`true` [this case also makes heredoc "quoted", a-la <<"EOF"] |
| + | //This contradicts the above docs. |
| ctx->pending_redirect->rd_filename = xstrdup(word->data); | |
| /* Cater for >\file case: | |
| * >\a creates file a; >\\a, >"\a", >"\\a" create file \a | |
| @@ -4228,6 +4235,7 @@ static int fetch_heredocs(int heredoc_cnt, struct parse_context *ctx, struct in_ | |
| redir->rd_type = REDIRECT_HEREDOC2; | |
| /* redir->rd_dup is (ab)used to indicate <<- */ | |
| + | bb_error_msg("redir->rd_filename:'%s'", redir->rd_filename); |
| p = fetch_till_str(&ctx->as_string, input, | |
| redir->rd_filename, redir->rd_dup); | |
| if (!p) { | |
shell/hush_test/hush-heredoc/heredoc_backquote1.right+0 -5
| @@ -1,5 +0,0 @@ | |
| - | heredoc1 |
| - | Ok1:0 |
| - | heredoc2 |
| - | EO`false`F |
| - | Ok2:0 |
shell/hush_test/hush-heredoc/heredoc_backquote1.tests+0 -10
| @@ -1,10 +0,0 @@ | |
| - | cat <<EO`true`F |
| - | heredoc1 |
| - | EO`true`F |
| - | echo Ok1:$? |
| - | |
| - | cat <<EO`true`F |
| - | heredoc2 |
| - | EO`false`F |
| - | EO`true`F |
| - | echo Ok2:$? |