From: solar <solar@546481bc-9713-0410-bf18-d3337bbf4a3e>
Date: Thu, 20 Sep 2007 21:19:18 +0000 (+0000)
Subject: Added handling for fflush( NULL ).
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c18b088060cdfd4ac73c3c1de70ad32a2c66eed7;p=fw%2Fpdclib

Added handling for fflush( NULL ).


git-svn-id: https://srv7.svn-repos.de/dev34/pdclib/trunk@266 546481bc-9713-0410-bf18-d3337bbf4a3e
---

diff --git a/functions/_PDCLIB/fflush.c b/functions/_PDCLIB/fflush.c
new file mode 100644
index 0000000..3d26b40
--- /dev/null
+++ b/functions/_PDCLIB/fflush.c
@@ -0,0 +1,35 @@
+/* $Id$ */
+
+/* _PDCLIB_fflush( FILE * )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+
+int _PDCLIB_fflush( struct _PDCLIB_file_t * stream )
+{
+    if ( fwrite( stream->buffer, stream->bufidx, 1, stream ) == stream->bufidx )
+    {
+        stream->bufidx = 0;
+        return 0;
+    }
+    else
+    {
+        stream->status |= _PDCLIB_ERRORFLAG;
+        return EOF;
+    }
+}
+                
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    TESTCASE( NO_TESTDRIVER );
+    return TEST_RESULTS;
+}
+
+#endif
+
diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c
index 2ddb0ad..5118503 100644
--- a/functions/stdio/fflush.c
+++ b/functions/stdio/fflush.c
@@ -7,25 +7,35 @@
 */
 
 #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->bufidx > stream->bufend )
+            {
+                rc |= _PDCLIB_fflush( stream );
+            }
+            stream = stream->next;
+        }
+        return rc;
     }
     else
     {
-        stream->status |= _PDCLIB_ERRORFLAG;
-        return EOF;
+        return _PDCLIB_fflush( stream );
     }
 }
-
+                
 #endif
 
 #ifdef TEST