#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
#ifndef REGTEST
-#include <_PDCLIB_glue.h>
+#include <_PDCLIB_io.h>
+#include <threads.h>
-extern struct _PDCLIB_file_t * _PDCLIB_filelist;
+extern FILE * _PDCLIB_filelist;
-/* FIXME: Last file not removed from list. */
-int fclose( struct _PDCLIB_file_t * stream )
+int fclose( FILE * stream )
{
- struct _PDCLIB_file_t * current = _PDCLIB_filelist;
- struct _PDCLIB_file_t * previous = NULL;
+ FILE * current = _PDCLIB_filelist;
+ FILE * previous = NULL;
/* Checking that the FILE handle is actually one we had opened before. */
while ( current != NULL )
{
if ( stream == current )
{
- if ( stream->status & _PDCLIB_WROTELAST ) fflush( stream );
- if ( stream->status & _PDCLIB_LIBBUFFER ) free( stream->buffer );
- _PDCLIB_close( stream->handle );
+ /* Flush buffer */
+ if ( stream->status & _PDCLIB_FWRITE )
+ {
+ if ( _PDCLIB_flushbuffer( stream ) == EOF )
+ {
+ /* Flush failed, errno already set */
+ return EOF;
+ }
+ }
+
+ /* Release mutex*/
+ mtx_destroy( &stream->lock );
+
+ /* Close handle */
+ stream->ops->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;
+ }
+ /* Delete tmpfile() */
+ if ( stream->status & _PDCLIB_DELONCLOSE )
+ {
+ remove( stream->filename );
+ }
+ /* Free stream */
+ if ( ! ( stream->status & _PDCLIB_STATIC ) )
+ {
+ free( stream );
}
return 0;
}
previous = current;
current = current->next;
}
+
+ errno = EINVAL;
return -1;
}
int main( void )
{
#ifndef REGTEST
- /* FIXME: This is basically fopen() checking. Flushing and buffer-freeing is not checked. */
- struct _PDCLIB_file_t * file1;
- struct _PDCLIB_file_t * file2;
- TESTCASE( _PDCLIB_filelist == NULL );
- TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+ FILE * file1;
+ FILE * file2;
+ remove( testfile1 );
+ remove( testfile2 );
+ TESTCASE( _PDCLIB_filelist == stdin );
+ 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( testfile2, "w" ) ) != NULL );
TESTCASE( _PDCLIB_filelist == file2 );
TESTCASE( fclose( file1 ) == 0 );
TESTCASE( _PDCLIB_filelist == file2 );
TESTCASE( fclose( file2 ) == 0 );
- TESTCASE( _PDCLIB_filelist == NULL ); /* FIXME: fails */
- system( "rm testfile1 testfile2" );
+ TESTCASE( _PDCLIB_filelist == stdin );
+ TESTCASE( remove( testfile1 ) == 0 );
+ TESTCASE( remove( testfile2 ) == 0 );
#else
puts( " NOTEST fclose() test driver is PDCLib-specific." );
#endif
}
#endif
+