X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=3d9e25724f45bdf58de3ee14ba16d183af0bb0fa;hb=99677c35ae2bfd651274191143e140d730fc9925;hp=0b4233034afe5b79b7fe0bccfa8b2c477e8b2654;hpb=76aab9d24d750a2e639eb878d5907a8bcfab08cf;p=pdclib.old

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 0b42330..3d9e257 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -8,13 +8,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
+#include <threads.h>
 
 extern struct _PDCLIB_file_t * _PDCLIB_filelist;
 
-/* FIXME: Last file not removed from list. */
 int fclose( struct _PDCLIB_file_t * stream )
 {
     struct _PDCLIB_file_t * current = _PDCLIB_filelist;
@@ -24,9 +25,23 @@ int fclose( struct _PDCLIB_file_t * stream )
     {
         if ( stream == current )
         {
-            if ( stream->status & _PDCLIB_WROTELAST ) fflush( stream );
-            if ( stream->status & _PDCLIB_LIBBUFFER ) free( stream->buffer );
-            _PDCLIB_close( stream->handle );
+            /* 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;
@@ -35,12 +50,23 @@ int fclose( struct _PDCLIB_file_t * stream )
             {
                 _PDCLIB_filelist = stream->next;
             }
-            free( stream );
+            /* Delete tmpfile() */
+            if ( stream->status & _PDCLIB_DELONCLOSE )
+            {
+                remove( stream->filename );
+            }
+            /* Free stream */
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
+            {
+                free( stream );
+            }
             return 0;
         }
         previous = current;
         current = current->next;
     }
+
+    errno = EINVAL;
     return -1;
 }
 
@@ -54,20 +80,23 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    TESTCASE( _PDCLIB_filelist == NULL );
-    TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+    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( ( 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 == NULL );
-    system( "rm testfile1 testfile2" );
+    TESTCASE( _PDCLIB_filelist == stdin );
+    TESTCASE( remove( testfile1 ) == 0 );
+    TESTCASE( remove( testfile2 ) == 0 );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif
@@ -75,3 +104,4 @@ int main( void )
 }
 
 #endif
+