add proper fuxed-based locking for stdio

[musl] / src / stdio / fflush.c

diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index cf3f5b0..4c1647b 100644 (file)
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -2,22 +2,28 @@
 
 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;
+
+       /* Clear read and write modes */
+       f->wpos = f->wbase = f->wend = 0;
+       f->rpos = f->rend = 0;
 
        /* Hook for special behavior on flush */
        if (f->flush) f->flush(f);
 
-       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)
 {
@@ -31,14 +37,14 @@ 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=next) {
                FLOCK(f);
-               OFLUNLOCK();
-               r |= __fflush_unlocked(f);
-               OFLLOCK();
+               //OFLUNLOCK();
+               if (f->wpos > f->wbase) r |= __fflush_unlocked(f);
+               //OFLLOCK();
                next = f->next;
                FUNLOCK(f);
        }