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

diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c
index 2ddb0ad..67dba7c 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,25 +5,38 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_glue.h>
+
+extern struct _PDCLIB_file_t * _PDCLIB_filelist;
 
 int fflush( struct _PDCLIB_file_t * 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 );
     }
 }
-
+                
 #endif
 
 #ifdef TEST
@@ -33,7 +44,7 @@ int fflush( struct _PDCLIB_file_t * stream )
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    /* Testing covered by ftell.c */
     return TEST_RESULTS;
 }