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;
{
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 = stream->next;
{
_PDCLIB_filelist = stream->next;
}
+ /* Delete tmpfile() */
+ if ( stream->status & _PDCLIB_DELONCLOSE )
+ {
+ remove( stream->filename );
+ }
+ /* Free stream */
free( stream );
+
return 0;
}
previous = current;
current = current->next;
}
+ _PDCLIB_errno = _PDCLIB_EIO;
return -1;
}
#ifndef REGTEST
struct _PDCLIB_file_t * file1;
struct _PDCLIB_file_t * file2;
- TESTCASE( _PDCLIB_filelist == NULL );
- TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+ remove( "testing/testfile1" );
+ remove( "testing/testfile2" );
+ TESTCASE( _PDCLIB_filelist == stdin );
+ TESTCASE( ( file1 = fopen( "testing/testfile1", "w" ) ) != NULL );
TESTCASE( _PDCLIB_filelist == file1 );
- TESTCASE( ( file2 = fopen( "testfile2", "w" ) ) != NULL );
+ TESTCASE( ( file2 = fopen( "testing/testfile2", "w" ) ) != NULL );
TESTCASE( _PDCLIB_filelist == file2 );
TESTCASE( fclose( file2 ) == 0 );
TESTCASE( _PDCLIB_filelist == file1 );
- TESTCASE( ( file2 = fopen( "testfile1", "w" ) ) != NULL );
+ TESTCASE( ( file2 = fopen( "testing/testfile1", "w" ) ) != NULL );
TESTCASE( _PDCLIB_filelist == file2 );
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( "testing/testfile1" );
+ remove( "testing/testfile2" );
#else
puts( " NOTEST fclose() test driver is PDCLib-specific." );
#endif
}
#endif
+