X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffflush.c;h=3f1a4118a4d9a9ff7dc300b303e3e08badfbb4f3;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=137fd49d6e63217d5643c9a15e8f9e836cc431f1;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c
index 137fd49..3f1a411 100644
--- a/functions/stdio/fflush.c
+++ b/functions/stdio/fflush.c
@@ -1,55 +1,62 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int fflush( FILE * stream ) { /* TODO */ };
+/* fflush( FILE * )
 
-/* PDPC code - unreviewed
-Read the note in fopen.c.
-{
-#ifdef __OS2__
-    APIRET rc;
-    ULONG actualWritten;
-#endif
-#ifdef __MSDOS__
-    int errind;
-    size_t actualWritten;
-#endif
+   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>
+
+#ifndef REGTEST
+#include <_PDCLIB_io.h>
+
+extern FILE * _PDCLIB_filelist;
 
-    if ((stream->upto != stream->fbuf) && (stream->mode == __WRITE_MODE))
+int _PDCLIB_fflush_unlocked( FILE * stream )
+{
+    if ( stream == NULL )
     {
-#ifdef __OS2__
-        rc = DosWrite(stream->hfile,
-                     (VOID *)stream->fbuf,
-                     (size_t)(stream->upto - stream->fbuf),
-                     &actualWritten);
-        if (rc != 0)
-        {
-            stream->errorInd = 1;
-            errno = rc;
-            return (EOF);
-        }
-#endif
-#ifdef __MSDOS__
-        actualWritten = __write(stream->hfile,
-                                stream->fbuf,
-                                (size_t)(stream->upto - stream->fbuf),
-                                &errind);
-        if (errind)
+        stream = _PDCLIB_filelist;
+        /* TODO: Check what happens when fflush( NULL ) encounters write errors, in other libs */
+        int rc = 0;
+        while ( stream != NULL )
         {
-            stream->errorInd = 1;
-            errno = actualWritten;
-            return (EOF);
+            if ( stream->status & _PDCLIB_FWRITE )
+            {
+                if ( _PDCLIB_flushbuffer( stream ) == EOF )
+                {
+                    rc = EOF;
+                }
+            }
+            stream = stream->next;
         }
-#endif
-#ifndef __MVS__
-        stream->bufStartR += actualWritten;
-        stream->upto = stream->fbuf;
-#endif
+        return rc;
+    }
+    else
+    {
+        return _PDCLIB_flushbuffer( stream );
     }
-    return (0);
 }
-*/
+
+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>
+
+int main( void )
+{
+    /* Testing covered by ftell.c */
+    return TEST_RESULTS;
+}
+
+#endif
+