diff options
author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-10 17:35:41 +0000 |
---|---|---|
committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-10 17:35:41 +0000 |
commit | 68b705eda289521adc5ca96dd7c2e91371c074f0 (patch) | |
tree | cf533be80e939d36e234820d9041f00e6a089e59 | |
parent | ae59461445959bb2f8dc8ff791f401170d204c78 (diff) | |
download | zsh-68b705eda289521adc5ca96dd7c2e91371c074f0.tar.gz zsh-68b705eda289521adc5ca96dd7c2e91371c074f0.tar.xz zsh-68b705eda289521adc5ca96dd7c2e91371c074f0.zip |
Merge of 23051: using ${(Q)...} on an expression with RCQUOTE handling failed when DEBUG was defined.
-rw-r--r-- | Src/lex.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Src/lex.c b/Src/lex.c index 52b6885af..5b001c4eb 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -1536,9 +1536,13 @@ parse_subst_string(char *s) return 1; } #ifdef DEBUG - if (c != STRING || olen != l || errflag) { + /* + * Historical note: we used to check here for olen == l, but + * that's not necessarily the case if we stripped an RCQUOTE. + */ + if (c != STRING || errflag) { fprintf(stderr, "Oops. Bug in parse_subst_string: %s\n", - olen < l ? "len < l" : errflag ? "errflag" : "c != STRING"); + errflag ? "errflag" : "c != STRING"); fflush(stderr); untokenize(s); return 1; |