diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -136,7 +136,8 @@
 				fp->_p += n;
 				if ((fp->_flags & (__SLBF | __SNBF)) == 0)
 					fp->_w -= n;
-			} else if (p == fp->_p) { /* cond. to handle setvbuf */
+			/* conditional to handle setvbuf */
+			} else if (p == fp->_p && errno == EINTR) {
 				fp->_p = old_p;
 				fp->_w = old_w;
 			}
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -38,6 +38,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -140,7 +141,7 @@
 				fp->_p += w;
 				old_p = fp->_p;
 				if (__fflush(fp) == EOF) {
-					if (old_p == fp->_p)
+					if (old_p == fp->_p && errno == EINTR)
 						fp->_p -= w;
 					goto err;
 				}
@@ -184,7 +185,7 @@
 				fp->_p += w;
 				old_p = fp->_p;
 				if (__fflush(fp) == EOF) {
-					if (old_p == fp->_p)
+					if (old_p == fp->_p && errno == EINTR)
 						fp->_p -= w;
 					goto err;
 				}
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -82,7 +82,7 @@
 	 */
 	n = fp->_p - fp->_bf._base;
 	if (n >= fp->_bf._size) {
-		if (__fflush(fp))
+		if (__fflush(fp) != 0)
 			return (EOF);
 		n = 0;
 	}
@@ -90,8 +90,8 @@
 	*fp->_p++ = c;
 	old_p = fp->_p;
 	if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) {
-		if (__fflush(fp)) {
-			if (fp->_p == old_p) {
+		if (__fflush(fp) != 0) {
+			if (fp->_p == old_p && errno == EINTR) {
 				fp->_p--;
 				fp->_w++;
 			}