X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffflush.c;h=28793e3492979716b3e0a4cfedada564b3232ddc;hp=2ddb0ad18faad013c166f27a07fc570ef098909c;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=13ee02fa27a739d9d602f801126eadcfbfeab8a8

diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c
index 2ddb0ad..28793e3 100644
--- a/functions/stdio/fflush.c
+++ b/functions/stdio/fflush.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fflush( FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -7,33 +5,54 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+extern FILE * _PDCLIB_filelist;
 
-int fflush( struct _PDCLIB_file_t * stream )
+int _PDCLIB_fflush_unlocked( FILE * stream )
 {
-    /* FIXME: This is ad-hoc. */
-    if ( fwrite( stream->buffer, stream->bufidx, 1, stream ) == stream->bufidx )
+    if ( stream == NULL )
     {
-        stream->bufidx = 0;
-        return 0;
+        stream = _PDCLIB_filelist;
+        /* TODO: Check what happens when fflush( NULL ) encounters write errors, in other libs */
+        int rc = 0;
+        while ( stream != NULL )
+        {
+            if ( stream->status & _PDCLIB_FWRITE )
+            {
+                if ( _PDCLIB_flushbuffer( stream ) == EOF )
+                {
+                    rc = EOF;
+                }
+            }
+            stream = stream->next;
+        }
+        return rc;
     }
     else
     {
-        stream->status |= _PDCLIB_ERRORFLAG;
-        return EOF;
+        return _PDCLIB_flushbuffer( stream );
     }
 }
 
+int fflush( FILE * stream )
+{
+    _PDCLIB_flockfile( stream );
+    int res = _PDCLIB_fflush_unlocked(stream);
+    _PDCLIB_funlockfile( stream );
+    return res;
+}
+                
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    /* Testing covered by ftell.c */
     return TEST_RESULTS;
 }