X-Git-Url: https://pd.if.org/git/?p=pdclib.old;a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=37349c06881b98291e8a824c30b6d3c808ba3c2a;hp=dc27fe2eb1555a5e36bd7ceb513390d675baf415;hb=35d48051496adf237dcd22ff1324e93b6f351284;hpb=406e7c85a903d02f8a95f5b6dded5f2267e664ca

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index dc27fe2..37349c0 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -8,16 +8,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#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 )
     {
@@ -32,8 +34,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 )
             {
@@ -43,14 +50,28 @@ int fclose( struct _PDCLIB_file_t * stream )
             {
                 _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 */
-            free( stream );
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
+            {
+                free( stream );
+            }
             return 0;
         }
         previous = current;
         current = current->next;
     }
-    _PDCLIB_errno = _PDCLIB_EIO;
+
+    errno = EINVAL;
     return -1;
 }
 
@@ -62,25 +83,25 @@ int fclose( struct _PDCLIB_file_t * stream )
 int main( void )
 {
 #ifndef REGTEST
-    struct _PDCLIB_file_t * file1;
-    struct _PDCLIB_file_t * file2;
-    remove( "testfile1" );
-    remove( "testfile2" );
+    FILE * file1;
+    FILE * file2;
+    remove( testfile1 );
+    remove( testfile2 );
     TESTCASE( _PDCLIB_filelist == stdin );
-    TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file1 = fopen( testfile1, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testfile2", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
     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 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == stdin );
-    remove( "testfile1" );
-    remove( "testfile2" );
+    TESTCASE( remove( testfile1 ) == 0 );
+    TESTCASE( remove( testfile2 ) == 0 );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif