From: Karel Zak <kzak@redhat.com>
Date: Thu, 13 Mar 2014 11:41:03 +0000 (+0100)
Subject: include/closestream: don't wipe errno on EPIPE
X-Git-Tag: v2.25-rc1~424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422f93bfbb5df358fad3fedfe9eb0247cbf3cb14;p=thirdparty%2Futil-linux.git

include/closestream: don't wipe errno on EPIPE

... the code in close_stdout() is sensitive to EPIPE, so
wipe errno is close_stream() is probably bad idea.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/closestream.h b/include/closestream.h
index 2535c8b22e..7842456fba 100644
--- a/include/closestream.h
+++ b/include/closestream.h
@@ -24,8 +24,9 @@ close_stream(FILE * stream)
 	const int some_pending = (__fpending(stream) != 0);
 	const int prev_fail = (ferror(stream) != 0);
 	const int fclose_fail = (fclose(stream) != 0);
+
 	if (prev_fail || (fclose_fail && (some_pending || errno != EBADF))) {
-		if (!fclose_fail)
+		if (!fclose_fail && !(errno == EPIPE))
 			errno = 0;
 		return EOF;
 	}