Cleaned up the testing a bit.

[pdclib] / functions / stdio / fclose.c

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 3f7ce19dec0407dac54652eecce496207adbf1ee..2b686946c2f55ed9f5d594cec18b579dbccfb7a9 100644 (file)
--- 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,14 @@ 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 );
+
             return 0;
         }
         previous = current;
@@ -70,23 +70,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