X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=456acc171656a015487466a57eb9a1d8c0ddd7a5;hb=71712a8bb92d6a10218e3356c6d26554dc2633dd;hp=3f7ce19dec0407dac54652eecce496207adbf1ee;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 3f7ce19..456acc1 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -14,7 +14,6 @@
 
 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;
@@ -33,11 +32,6 @@ int fclose( struct _PDCLIB_file_t * stream )
                     return EOF;
                 }
             }
-            /* Free buffer */
-            if ( stream->status & _PDCLIB_LIBBUFFER )
-            {
-                free( stream->buffer );
-            }
             /* Close handle */
             _PDCLIB_close( stream->handle );
             /* Remove stream from list */
@@ -49,8 +43,16 @@ int fclose( struct _PDCLIB_file_t * stream )
             {
                 _PDCLIB_filelist = stream->next;
             }
+            /* Delete tmpfile() */
+            if ( stream->status & _PDCLIB_DELONCLOSE )
+            {
+                remove( stream->filename );
+            }
             /* Free stream */
-            free( stream );
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
+            {
+                free( stream );
+            }
             return 0;
         }
         previous = current;
@@ -70,23 +72,23 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    remove( "testfile1" );
-    remove( "testfile2" );
+    remove( "testing/testfile1" );
+    remove( "testing/testfile2" );
     TESTCASE( _PDCLIB_filelist == stdin );
-    TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file1 = fopen( "testing/testfile1", "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testfile2", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( "testing/testfile2", "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( "testing/testfile1", "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" );
+    remove( "testing/testfile1" );
+    remove( "testing/testfile2" );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif