PDCLIB-8: First phase of intergation of new I/O backend system (with minimal

[pdclib] / functions / stdio / fclose.c

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 2b686946c2f55ed9f5d594cec18b579dbccfb7a9..3d9e25724f45bdf58de3ee14ba16d183af0bb0fa 100644 (file)
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -8,9 +8,11 @@
 
 #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;
 
@@ -32,8 +34,13 @@ int fclose( struct _PDCLIB_file_t * stream )
                     return EOF;
                 }
             }
+
+            /* Release mutex*/
+            mtx_destroy( &stream->lock );
+
             /* Close handle */
-            _PDCLIB_close( stream->handle );
+            stream->ops->close(stream->handle);
+
             /* Remove stream from list */
             if ( previous != NULL )
             {
@@ -49,14 +56,17 @@ 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;
+
+    errno = EINVAL;
     return -1;
 }
 
@@ -70,23 +80,23 @@ int main( void )
 #ifndef REGTEST
     struct _PDCLIB_file_t * file1;
     struct _PDCLIB_file_t * file2;
-    remove( "testing/testfile1" );
-    remove( "testing/testfile2" );
+    remove( testfile1 );
+    remove( testfile2 );
     TESTCASE( _PDCLIB_filelist == stdin );
-    TESTCASE( ( file1 = fopen( "testing/testfile1", "w" ) ) != NULL );
+    TESTCASE( ( file1 = fopen( testfile1, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testing/testfile2", "w" ) ) != NULL );
+    TESTCASE( ( file2 = fopen( testfile2, "w" ) ) != NULL );
     TESTCASE( _PDCLIB_filelist == file2 );
     TESTCASE( fclose( file2 ) == 0 );
     TESTCASE( _PDCLIB_filelist == file1 );
-    TESTCASE( ( file2 = fopen( "testing/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 == stdin );
-    remove( "testing/testfile1" );
-    remove( "testing/testfile2" );
+    TESTCASE( remove( testfile1 ) == 0 );
+    TESTCASE( remove( testfile2 ) == 0 );
 #else
     puts( " NOTEST fclose() test driver is PDCLib-specific." );
 #endif