X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=c33860a11ce87741125834bfa5f45ee74fc2896e;hb=b1fc26afebd4d557ff89a44bc21767a8704c3809;hp=0e822eb95ad58af5518497af060b032a22a63d7e;hpb=b406087285dda97f2666a7f52f66b14582ed937b;p=pdclib

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 0e822eb..c33860a 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).
@@ -49,14 +47,19 @@ int fclose( struct _PDCLIB_file_t * stream )
                 remove( stream->filename );
             }
             /* Free stream */
-            free( stream );
-
+            if ( ! ( stream->status & _PDCLIB_STATIC ) )
+            {
+                free( stream );
+            }
             return 0;
         }
         previous = current;
         current = current->next;
     }
-    _PDCLIB_errno = _PDCLIB_EIO;
+    /* See the comments on implementation-defined errno values in
+       <_PDCLIB_config.h>.
+    */
+    _PDCLIB_errno = _PDCLIB_ERROR;
     return -1;
 }
 
@@ -70,23 +73,23 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    remove( "testfile1" );
-    remove( "testfile2" );
+    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( 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" );
+    TESTCASE( remove( testfile1 ) == 0 );
+    TESTCASE( remove( testfile2 ) == 0 );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif