diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2002-03-18 04:55:33 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2002-03-18 04:55:33 +0000 |
| commit | 28c052a7b71cc521ba4e9f5b48c185dd9d0bb226 (patch) | |
| tree | 97bfe85cea08e900934459a47d0cf7096ce6efc8 /Src/builtin.c | |
| parent | c2f1f5187273a190f82f33046ca4e7c7adeef1a4 (diff) | |
| download | zsh-28c052a7b71cc521ba4e9f5b48c185dd9d0bb226.tar.gz zsh-28c052a7b71cc521ba4e9f5b48c185dd9d0bb226.tar.xz zsh-28c052a7b71cc521ba4e9f5b48c185dd9d0bb226.zip | |
Merge 16546,16556,16820 from dev version.
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index cbc69b599..b51f61e27 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3031,9 +3031,11 @@ bin_print(char *name, char **args, char *ops, int func) } while (*ap); fputc(ops['N'] ? '\0' : '\n', fout); } - if (((fout != stdout) ? fclose(fout) : fflush(fout)) != 0) { - zwarnnam(name, "write error: %e", NULL, errno); - ret = 1; + /* Testing EBADF special-cases >&- redirections */ + if ((fout != stdout) ? (fclose(fout) != 0) : + (fflush(fout) != 0 && errno != EBADF)) { + zwarnnam(name, "write error: %e", NULL, errno); + ret = 1; } return ret; } @@ -3045,7 +3047,9 @@ bin_print(char *name, char **args, char *ops, int func) } if (!(ops['n'] || nnl)) fputc(ops['N'] ? '\0' : '\n', fout); - if (((fout != stdout) ? fclose(fout) : fflush(fout)) != 0) { + /* Testing EBADF special-cases >&- redirections */ + if ((fout != stdout) ? (fclose(fout) != 0) : + (fflush(fout) != 0 && errno != EBADF)) { zwarnnam(name, "write error: %e", NULL, errno); ret = 1; } |