diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-11-18 10:07:31 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-11-18 10:07:31 +0000 |
| commit | 14231691e15744c0aac39224e9aa0d84835313fe (patch) | |
| tree | 27682b81236d64e641f4bb476ff710dc84e968c4 /Src/parse.c | |
| parent | 0d0e497c693939633fda6cfa0c3269258b8e97ec (diff) | |
| download | zsh-14231691e15744c0aac39224e9aa0d84835313fe.tar.gz zsh-14231691e15744c0aac39224e9aa0d84835313fe.zip | |
26061: fix clash between process subst and numeric glob
26062: additional compmatch change, missed from 26047
Diffstat (limited to 'Src/parse.c')
| -rw-r--r-- | Src/parse.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Src/parse.c b/Src/parse.c index 6ff73a831..722809a78 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -1574,7 +1574,7 @@ par_simple(int *complex, int nr) * we need process handling. */ if (p[1] == Inpar && - (*p == Equals || *p == Inang || *p == Outang)) { + (*p == Equals || *p == Inang || *p == OutangProc)) { *complex = 1; break; } @@ -1833,7 +1833,7 @@ par_redir(int *rp, char *idstring) } case REDIR_WRITE: case REDIR_WRITENOW: - if (tokstr[0] == Outang && tokstr[1] == Inpar) + if (tokstr[0] == OutangProc && tokstr[1] == Inpar) /* > >(...) */ type = REDIR_OUTPIPE; else if (tokstr[0] == Inang && tokstr[1] == Inpar) @@ -1843,11 +1843,12 @@ par_redir(int *rp, char *idstring) if (tokstr[0] == Inang && tokstr[1] == Inpar) /* < <(...) */ type = REDIR_INPIPE; - else if (tokstr[0] == Outang && tokstr[1] == Inpar) + else if (tokstr[0] == OutangProc && tokstr[1] == Inpar) YYERROR(ecused); break; case REDIR_READWRITE: - if ((tokstr[0] == Inang || tokstr[0] == Outang) && tokstr[1] == Inpar) + if ((tokstr[0] == Inang || tokstr[0] == OutangProc) && + tokstr[1] == Inpar) type = tokstr[0] == Inang ? REDIR_INPIPE : REDIR_OUTPIPE; break; } |