From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 10 Feb 2016 18:51:05 +0000 (-0500)
Subject: fix failed write reporting by fwrite in line-buffered mode
X-Git-Tag: v1.1.13~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5a6e8d098abfef67028e6c3edbac39e0bbaf8bd8;p=oweals%2Fmusl.git

fix failed write reporting by fwrite in line-buffered mode

when a write error occurred while flushing output due to a newline,
fwrite falsely reported all bytes up to and including the newline as
successfully written. in general, due to buffering such "spurious
success" returns are acceptable for stdio; however for line-buffered
mode it was subtly wrong. errors were still visible via ferror() or as
a short-write return if there was more data past the newline that
should have been written, but since the contract for line-buffered
mode is that everything up through the newline be written out
immediately, a discrepency was observable in the actual file contents.
---

diff --git a/src/stdio/fwrite.c b/src/stdio/fwrite.c
index 81ec271e..fa30c0d3 100644
--- a/src/stdio/fwrite.c
+++ b/src/stdio/fwrite.c
@@ -13,8 +13,8 @@ size_t __fwritex(const unsigned char *restrict s, size_t l, FILE *restrict f)
 		/* Match /^(.*\n|)/ */
 		for (i=l; i && s[i-1] != '\n'; i--);
 		if (i) {
-			if (f->write(f, s, i) < i)
-				return i;
+			size_t n = f->write(f, s, i);
+			if (n < i) return n;
 			s += i;
 			l -= i;
 		}