projects
/
fw
/
pdclib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked scanf() testing. General cleanups.
[fw/pdclib]
/
functions
/
stdio
/
fclose.c
diff --git
a/functions/stdio/fclose.c
b/functions/stdio/fclose.c
index ff01058d59c005e581d495318a4721188b900451..3a25b521143f706e05ef945e19441380e6c72e83 100644
(file)
--- a/
functions/stdio/fclose.c
+++ b/
functions/stdio/fclose.c
@@
-14,7
+14,6
@@
extern struct _PDCLIB_file_t * _PDCLIB_filelist;
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;
int fclose( struct _PDCLIB_file_t * stream )
{
struct _PDCLIB_file_t * current = _PDCLIB_filelist;
@@
-24,22
+23,42
@@
int fclose( struct _PDCLIB_file_t * stream )
{
if ( stream == current )
{
{
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 );
_PDCLIB_close( stream->handle );
+ /* Remove stream from list */
if ( previous != NULL )
{
if ( previous != NULL )
{
- previous
= current
->next;
+ previous
->next = stream
->next;
}
else
{
}
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;
}
}
return 0;
}
previous = current;
current = current->next;
}
+ _PDCLIB_errno = _PDCLIB_EIO;
return -1;
}
return -1;
}
@@
-50,24
+69,31
@@
int fclose( struct _PDCLIB_file_t * stream )
int main( void )
{
int main( void )
{
- /* FIXME: This is basically fopen() checking. Flushing and buffer-freeing is not checked. */
+#ifndef REGTEST
struct _PDCLIB_file_t * file1;
struct _PDCLIB_file_t * file2;
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( _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( _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 == 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 );
+ TESTCASE( remove( testfile1 ) == 0 );
+ TESTCASE( remove( testfile2 ) == 0 );
+#else
+ puts( " NOTEST fclose() test driver is PDCLib-specific." );
+#endif
return TEST_RESULTS;
}
#endif
return TEST_RESULTS;
}
#endif
+