Module Name: src
Committed By: christos
Date: Fri Jul 9 09:24:16 UTC 2021
Modified Files:
src/lib/libc/stdio: fflush.c
Log Message:
Don't adjust the buffers when write returns 0. This happens with fmemopen
and other synthetic write functions. This fixes the unit-tests for fmemopen,
but adjusting should be the right behavior for all cases?
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/stdio/fflush.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/fflush.c
diff -u src/lib/libc/stdio/fflush.c:1.22 src/lib/libc/stdio/fflush.c:1.23
--- src/lib/libc/stdio/fflush.c:1.22 Thu Jul 8 11:44:44 2021
+++ src/lib/libc/stdio/fflush.c Fri Jul 9 05:24:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fflush.c,v 1.22 2021/07/08 15:44:44 christos Exp $ */
+/* $NetBSD: fflush.c,v 1.23 2021/07/09 09:24:16 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fflush.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fflush.c,v 1.22 2021/07/08 15:44:44 christos Exp $");
+__RCSID("$NetBSD: fflush.c,v 1.23 2021/07/09 09:24:16 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -107,7 +107,9 @@ __sflush(FILE *fp)
for (; n > 0; n -= t, p += t) {
t = (*fp->_write)(fp->_cookie, (char *)p, n);
- if (t <= 0) {
+ if (t == 0)
+ goto out;
+ if (t < 0) {
/* Reset _p and _w. */
if (p > fp->_p) {
/* Some was written. */
@@ -116,6 +118,7 @@ __sflush(FILE *fp)
fp->_p += n;
if ((fp->_flags & (__SLBF | __SNBF)) == 0)
fp->_w -= n;
+out:
fp->_flags |= __SERR;
return EOF;
}
