X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffflush.c;h=b00943764189901ba6f938714561de7466a5dc38;hb=21a172dd36cae7a08492fd3a7500d7bf0daee13e;hp=c28810659aba7a6a6dd9148376314d251dc7bc69;hpb=c002668eb0352e619ea7064e4940b397b4a6e68d;p=musl

diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index c2881065..b0094376 100644
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -3,14 +3,20 @@
 /* stdout.c will override this if linked */
 static FILE *volatile dummy = 0;
 weak_alias(dummy, __stdout_used);
+weak_alias(dummy, __stderr_used);
 
 int fflush(FILE *f)
 {
 	if (!f) {
-		int r = __stdout_used ? fflush(__stdout_used) : 0;
+		int r = 0;
+		if (__stdout_used) r |= fflush(__stdout_used);
+		if (__stderr_used) r |= fflush(__stderr_used);
 
-		for (f=*__ofl_lock(); f; f=f->next)
-			if (f->wpos > f->wbase) r |= fflush(f);
+		for (f=*__ofl_lock(); f; f=f->next) {
+			FLOCK(f);
+			if (f->wpos != f->wbase) r |= fflush(f);
+			FUNLOCK(f);
+		}
 		__ofl_unlock();
 
 		return r;
@@ -19,7 +25,7 @@ int fflush(FILE *f)
 	FLOCK(f);
 
 	/* If writing, flush output */
-	if (f->wpos > f->wbase) {
+	if (f->wpos != f->wbase) {
 		f->write(f, 0, 0);
 		if (!f->wpos) {
 			FUNLOCK(f);
@@ -28,7 +34,7 @@ int fflush(FILE *f)
 	}
 
 	/* If reading, sync position, per POSIX */
-	if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
+	if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR);
 
 	/* Clear read and write modes */
 	f->wpos = f->wbase = f->wend = 0;