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

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 113845b..c80e31d 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fclose( FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,14 +9,15 @@
 #include <errno.h>
 
 #ifndef REGTEST
-#include <_PDCLIB_glue.h>
+#include "_PDCLIB_io.h"
+#include <threads.h>
 
-extern struct _PDCLIB_file_t * _PDCLIB_filelist;
+extern FILE * _PDCLIB_filelist;
 
-int fclose( struct _PDCLIB_file_t * stream )
+int fclose( FILE * stream )
 {
-    struct _PDCLIB_file_t * current = _PDCLIB_filelist;
-    struct _PDCLIB_file_t * previous = NULL;
+    FILE * current = _PDCLIB_filelist;
+    FILE * previous = NULL;
     /* Checking that the FILE handle is actually one we had opened before. */
     while ( current != NULL )
     {
@@ -33,8 +32,13 @@ int fclose( struct _PDCLIB_file_t * stream )
                     return EOF;
                 }
             }
+
+            /* Release mutex*/
+            mtx_destroy( &stream->lock );
+
             /* Close handle */
-            _PDCLIB_close( stream->handle );
+            stream->ops->close(stream->handle);
+
             /* Remove stream from list */
             if ( previous != NULL )
             {
@@ -49,6 +53,11 @@ int fclose( struct _PDCLIB_file_t * stream )
             {
                 remove( stream->filename );
             }
+            /* Free user buffer (SetVBuf allocated) */
+            if ( stream->status & _PDCLIB_FREEBUFFER )
+            {
+                free( stream->buffer );
+            }
             /* Free stream */
             if ( ! ( stream->status & _PDCLIB_STATIC ) )
             {
@@ -67,13 +76,13 @@ int fclose( struct _PDCLIB_file_t * stream )
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
 #ifndef REGTEST
-    struct _PDCLIB_file_t * file1;
-    struct _PDCLIB_file_t * file2;
+    FILE * file1;
+    FILE * file2;
     remove( testfile1 );
     remove( testfile2 );
     TESTCASE( _PDCLIB_filelist == stdin );
@@ -83,7 +92,7 @@ int main( void )
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file1 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file2 );