diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-09-25 12:10:05 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-09-25 12:10:05 +0000 |
| commit | c2266c1f5fccb97bf650b02dbc683e82c167aba7 (patch) | |
| tree | 8a0ba1a0ff2f49db7017a1dab3502d313a36e959 | |
| parent | 66b3e3412ddfc8ee0bb37bef8837ac924cc664f5 (diff) | |
| download | zsh-c2266c1f5fccb97bf650b02dbc683e82c167aba7.tar.gz zsh-c2266c1f5fccb97bf650b02dbc683e82c167aba7.tar.xz zsh-c2266c1f5fccb97bf650b02dbc683e82c167aba7.zip | |
job text building code couldn't handle empty sublists (as in `coproc || test') (15868)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/text.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5df213ca1..3e9ce1747 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-09-25 Sven Wischnowsky <wischnow@zsh.org> + + * 15868: Src/text.c: job text building code couldn't handle + empty sublists (as in `coproc || test') + 2001-09-25 Clint Adams <clint@zsh.org> * 15866: Completion/Unix/Command/_ssh: diff --git a/Src/text.c b/Src/text.c index 2215b45fd..73b409e02 100644 --- a/Src/text.c +++ b/Src/text.c @@ -274,10 +274,12 @@ gettext2(Estate state) break; case WC_SUBLIST: if (!s) { + if (wc_code(*state->pc) != WC_PIPE) + stack = 1; if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT) - taddstr("! "); + taddstr(stack ? "!" : "! "); if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_COPROC) - taddstr("coproc "); + taddstr(stack ? "coproc" : "coproc "); s = tpush(code, (WC_SUBLIST_TYPE(code) == WC_SUBLIST_END)); } else { if (!(stack = (WC_SUBLIST_TYPE(code) == WC_SUBLIST_END))) { |