X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=a5b9e96942cbbeb6d0c310e5c34db2020c637eda;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=f633de3e8cf1364cf7583dfa52e635e600fe4d58;hpb=188eee8e94ce6e968e0791bae1c7682dafe9ec9c;p=pdclib diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c index f633de3..a5b9e96 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). @@ -10,11 +8,10 @@ #include #ifndef REGTEST -#include <_PDCLIB_glue.h> +#include "_PDCLIB_glue.h" 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; @@ -24,50 +21,75 @@ 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; + } + } + /* 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; + } + /* 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; } + /* See the comments on implementation-defined errno values in + <_PDCLIB_config.h>. + */ + _PDCLIB_errno = _PDCLIB_ERROR; return -1; } #endif #ifdef TEST -#include <_PDCLIB_test.h> +#include "_PDCLIB_test.h" 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 ); + 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( testfile1, "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 @@ -75,3 +97,4 @@ int main( void ) } #endif +