diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/text.c | 21 |
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index ab30d8226..917fbb16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-10 Peter Stephenson <pws@csr.com> + + * 22151: Src/text.c: a here-string got too many quotes when + output by which etc. + 2006-01-09 Wayne Davison <wayned@users.sourceforge.net> * unposted: Src/utils.c, Src/Zle/compmatch.c, Src/Zle/zle_utils.c: diff --git a/Src/text.c b/Src/text.c index ceb4bfdf4..db24d8c9e 100644 --- a/Src/text.c +++ b/Src/text.c @@ -798,16 +798,17 @@ getredirs(LinkList redirs) taddstr(fstr[f->type]); if (f->type != REDIR_MERGEIN && f->type != REDIR_MERGEOUT) taddchr(' '); - if (f->type == REDIR_HERESTR) { - if (has_token(f->name)) { - taddchr('\"'); - taddstr(bslashquote(f->name, NULL, 2)); - taddchr('\"'); - } else { - taddchr('\''); - taddstr(bslashquote(f->name, NULL, 1)); - taddchr('\''); - } + if (f->type == REDIR_HERESTR && !has_token(f->name)) { + /* + * Strings that came from here-documents are converted + * to here strings without quotation, so add that + * now. If tokens are already present taddstr() + * will do the right thing (anyway, adding more + * quotes certainly isn't right in that case). + */ + taddchr('\''); + taddstr(bslashquote(f->name, NULL, 1)); + taddchr('\''); } else taddstr(f->name); taddchr(' '); |