X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffflush.c;h=af7095033bca73c25a5488ebc2769207e5483666;hb=96fbcf7d80f469e39d1dd12533f8bb8d13b64fe5;hp=cf3f5b0efcc11d25b232ae2d8c2076a252df0fb7;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index cf3f5b0e..af709503 100644
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -2,27 +2,29 @@
 
 static int __fflush_unlocked(FILE *f)
 {
-	/* If writing, flush output. */
-	if (f->wpos > f->buf && __oflow(f)) return -1;
+	/* If writing, flush output */
+	if (f->wpos > f->wbase) {
+		f->write(f, 0, 0);
+		if (!f->wpos) return EOF;
+	}
 
 	/* If reading, sync position, per POSIX */
 	if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
-	f->rpos = f->rend;
 
-	/* Hook for special behavior on flush */
-	if (f->flush) f->flush(f);
+	/* Clear read and write modes */
+	f->wpos = f->wbase = f->wend = 0;
+	f->rpos = f->rend = 0;
 
-	return (f->flags & F_ERR) ? EOF : 0;
+	return 0;
 }
 
 /* stdout.c will override this if linked */
-static FILE *const __dummy = 0;
-weak_alias(__dummy, __stdout_to_flush);
+static FILE *const dummy = 0;
+weak_alias(dummy, __stdout_used);
 
 int fflush(FILE *f)
 {
 	int r;
-	FILE *next;
 
 	if (f) {
 		FLOCK(f);
@@ -31,15 +33,12 @@ int fflush(FILE *f)
 		return r;
 	}
 
-	r = __stdout_to_flush ? fflush(__stdout_to_flush) : 0;
+	r = __stdout_used ? fflush(__stdout_used) : 0;
 
 	OFLLOCK();
-	for (f=ofl_head; f; f=next) {
+	for (f=libc.ofl_head; f; f=f->next) {
 		FLOCK(f);
-		OFLUNLOCK();
-		r |= __fflush_unlocked(f);
-		OFLLOCK();
-		next = f->next;
+		if (f->wpos > f->wbase) r |= __fflush_unlocked(f);
 		FUNLOCK(f);
 	}
 	OFLUNLOCK();