X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=3f7ce19dec0407dac54652eecce496207adbf1ee;hb=0d54a75af25ca44411e7c4190cc2a93a390e61a2;hp=9ddff44de929f52442d3cdc3a967954fcd0373ca;hpb=22b64ead4cdb08b34e3db82fa1fb1c6095f6b0e9;p=pdclib.old

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 9ddff44..3f7ce19 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -24,22 +24,39 @@ 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 );
+            /* Flush buffer */
+            if ( stream->status & _PDCLIB_FWRITE )
+            {
+                if ( _PDCLIB_flushbuffer( stream ) == EOF )
+                {
+                    /* Flush failed, errno already set */
+                    return EOF;
+                }
+            }
+            /* Free buffer */
+            if ( stream->status & _PDCLIB_LIBBUFFER )
+            {
+                free( stream->buffer );
+            }
+            /* Close handle */
             _PDCLIB_close( stream->handle );
+            /* Remove stream from list */
             if ( previous != NULL )
             {
-                previous->next = current->next;
+                previous->next = stream->next;
             }
             else
             {
-                _PDCLIB_filelist = current->next;
+                _PDCLIB_filelist = stream->next;
             }
+            /* Free stream */
+            free( stream );
             return 0;
         }
         previous = current;
         current = current->next;
     }
+    _PDCLIB_errno = _PDCLIB_EIO;
     return -1;
 }
 
@@ -53,7 +70,9 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    TESTCASE( _PDCLIB_filelist == 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 );
@@ -65,8 +84,9 @@ int main( void )
     TESTCASE( fclose( file1 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
-    TESTCASE( _PDCLIB_filelist == NULL );
-    system( "rm testfile1 testfile2" );
+    TESTCASE( _PDCLIB_filelist == stdin );
+    remove( "testfile1" );
+    remove( "testfile2" );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif
@@ -74,3 +94,4 @@ int main( void )
 }
 
 #endif
+