diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-03-06 21:37:38 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-03-06 21:37:38 +0000 |
| commit | 7bc97b920b74e7d9046c8a4489ecd0a0e646bdde (patch) | |
| tree | 32c7eb735bf59014eaea142c2fefd085172f69b3 /Src/exec.c | |
| parent | 1a3612f119a6082031203ffb3208eec865adc12f (diff) | |
| download | zsh-7bc97b920b74e7d9046c8a4489ecd0a0e646bdde.tar.gz zsh-7bc97b920b74e7d9046c8a4489ecd0a0e646bdde.tar.xz zsh-7bc97b920b74e7d9046c8a4489ecd0a0e646bdde.zip | |
28866: with POSIX_BUILTINS "command" prefix resets specialness
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Src/exec.c b/Src/exec.c index f1b87e152..9c72c68af 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2324,7 +2324,7 @@ execcmd(Estate state, int input, int output, int how, int last1) int nullexec = 0, assign = 0, forked = 0; int is_shfunc = 0, is_builtin = 0, is_exec = 0, use_defpath = 0; /* Various flags to the command. */ - int cflags = 0, checked = 0, oautocont = -1; + int cflags = 0, orig_cflags = 0, checked = 0, oautocont = -1; LinkList redir; wordcode code; Wordcode beg = state->pc, varspc; @@ -2416,6 +2416,7 @@ execcmd(Estate state, int input, int output, int how, int last1) checked = !(cflags & BINF_BUILTIN); break; } + orig_cflags |= cflags; cflags &= ~BINF_BUILTIN & ~BINF_COMMAND; cflags |= hn->flags; if (!(hn->flags & BINF_PREFIX)) { @@ -3298,11 +3299,13 @@ execcmd(Estate state, int input, int output, int how, int last1) done: if (isset(POSIXBUILTINS) && - (cflags & (BINF_PSPECIAL|BINF_EXEC))) { + (cflags & (BINF_PSPECIAL|BINF_EXEC)) && + !(orig_cflags & BINF_COMMAND)) { /* * For POSIX-compatible behaviour with special * builtins (including exec which we don't usually * classify as a builtin) we treat all errors as fatal. + * The "command" builtin is not special so resets this behaviour. */ if (redir_err || errflag) { if (!isset(INTERACTIVE)) { |