From 28c052a7b71cc521ba4e9f5b48c185dd9d0bb226 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Mon, 18 Mar 2002 04:55:33 +0000 Subject: Merge 16546,16556,16820 from dev version. --- Src/builtin.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Src/builtin.c') 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; } -- cgit 1.4.1