X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffflush.c;h=bf1e843765761a4566ccb15130c94a0cc449a2c5;hb=5f12ffe1239a5e4f8d4e98e2dff4e191a71f4693;hp=4c1647b7c9d933bf6d97c6954e45b9f68b556019;hpb=dba68bf98fc708cea4c478278c889fc7ad802b00;p=musl

diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index 4c1647b7..bf1e8437 100644
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -1,11 +1,33 @@
 #include "stdio_impl.h"
 
-static int __fflush_unlocked(FILE *f)
+/* stdout.c will override this if linked */
+static FILE *volatile dummy = 0;
+weak_alias(dummy, __stdout_used);
+
+int fflush(FILE *f)
 {
+	if (!f) {
+		int r = __stdout_used ? fflush(__stdout_used) : 0;
+
+		for (f=*__ofl_lock(); f; f=f->next) {
+			FLOCK(f);
+			if (f->wpos > f->wbase) r |= fflush(f);
+			FUNLOCK(f);
+		}
+		__ofl_unlock();
+
+		return r;
+	}
+
+	FLOCK(f);
+
 	/* If writing, flush output */
 	if (f->wpos > f->wbase) {
 		f->write(f, 0, 0);
-		if (!f->wpos) return EOF;
+		if (!f->wpos) {
+			FUNLOCK(f);
+			return EOF;
+		}
 	}
 
 	/* If reading, sync position, per POSIX */
@@ -15,42 +37,8 @@ static int __fflush_unlocked(FILE *f)
 	f->wpos = f->wbase = f->wend = 0;
 	f->rpos = f->rend = 0;
 
-	/* Hook for special behavior on flush */
-	if (f->flush) f->flush(f);
-
+	FUNLOCK(f);
 	return 0;
 }
 
-/* stdout.c will override this if linked */
-static FILE *const dummy = 0;
-weak_alias(dummy, __stdout_used);
-
-int fflush(FILE *f)
-{
-	int r;
-	FILE *next;
-
-	if (f) {
-		FLOCK(f);
-		r = __fflush_unlocked(f);
-		FUNLOCK(f);
-		return r;
-	}
-
-	r = __stdout_used ? fflush(__stdout_used) : 0;
-
-	OFLLOCK();
-	for (f=libc.ofl_head; f; f=next) {
-		FLOCK(f);
-		//OFLUNLOCK();
-		if (f->wpos > f->wbase) r |= __fflush_unlocked(f);
-		//OFLLOCK();
-		next = f->next;
-		FUNLOCK(f);
-	}
-	OFLUNLOCK();
-	
-	return r;
-}
-
-weak_alias(__fflush_unlocked, fflush_unlocked);
+weak_alias(fflush, fflush_unlocked);