X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=c80e31d1a09f11e7ed56f2b6c25d48d8ff0657a9;hp=f672fb0abb9cadd16ddc32f6b5a2020400a431d6;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=1d9d92ba957a0b8307c9a65c35867fde68e6533b

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index f672fb0..c80e31d 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -1,43 +1,110 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
-
-int fclose( FILE * stream ) { /* TODO */ };
-
-/* PDPC code - unreviewed.
-Read the note in fopen.c.
-int fclose(FILE *stream)
-{
-#ifdef __OS2__
-    APIRET rc;
-#endif
+/* fclose( FILE * )
 
-    fflush(stream);
-#ifdef __OS2__
-    rc = DosClose(stream->hfile);
-#endif
-#ifdef __MSDOS__
-    __close(stream->hfile);
-#endif
-#ifdef __MVS__
-    __aclose(stream->hfile);
-#endif
-    __userFiles[stream->intFno] = NULL;
-    if (!stream->theirBuffer)
-    {
-        free(stream->intBuffer);
-    }
-    free(stream);
-#ifdef __OS2__
-    if (rc != 0)
+   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>
+#include <stdlib.h>
+#include <errno.h>
+
+#ifndef REGTEST
+#include "_PDCLIB_io.h"
+#include <threads.h>
+
+extern FILE * _PDCLIB_filelist;
+
+int fclose( FILE * stream )
+{
+    FILE * current = _PDCLIB_filelist;
+    FILE * previous = NULL;
+    /* Checking that the FILE handle is actually one we had opened before. */
+    while ( current != NULL )
     {
-        errno = rc;
-        return (EOF);
+        if ( stream == current )
+        {
+            /* Flush buffer */
+            if ( stream->status & _PDCLIB_FWRITE )
+            {
+                if ( _PDCLIB_flushbuffer( stream ) == EOF )
+                {
+                    /* Flush failed, errno already set */
+                    return EOF;
+                }
+            }
+
+            /* Release mutex*/
+            mtx_destroy( &stream->lock );
+
+            /* Close handle */
+            stream->ops->close(stream->handle);
+
+            /* Remove stream from list */
+            if ( previous != NULL )
+            {
+                previous->next = stream->next;
+            }
+            else
+            {
+                _PDCLIB_filelist = stream->next;
+            }
+            /* Delete tmpfile() */
+            if ( stream->status & _PDCLIB_DELONCLOSE )
+            {
+                remove( stream->filename );
+            }
+            /* Free user buffer (SetVBuf allocated) */
+            if ( stream->status & _PDCLIB_FREEBUFFER )
+            {
+                free( stream->buffer );
+            }
+            /* Free stream */
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
+            {
+                free( stream );
+            }
+            return 0;
+        }
+        previous = current;
+        current = current->next;
     }
+
+    errno = EINVAL;
+    return -1;
+}
+
 #endif
-    return (0);
+
+#ifdef TEST
+#include "_PDCLIB_test.h"
+
+int main( void )
+{
+#ifndef REGTEST
+    FILE * file1;
+    FILE * file2;
+    remove( testfile1 );
+    remove( testfile2 );
+    TESTCASE( _PDCLIB_filelist == stdin );
+    TESTCASE( ( file1 = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file1 );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file2 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == file1 );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file1 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file2 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == stdin );
+    TESTCASE( remove( testfile1 ) == 0 );
+    TESTCASE( remove( testfile2 ) == 0 );
+#else
+    puts( " NOTEST fclose() test driver is PDCLib-specific." );
+#endif
+    return TEST_RESULTS;
 }
-*/
+
+#endif
+