From f63c745c3dde325a2260f2f8b998e2b24bb6419e Mon Sep 17 00:00:00 2001 From: solar Date: Thu, 20 Sep 2007 21:19:18 +0000 Subject: [PATCH] Added handling for fflush( NULL ). --- functions/_PDCLIB/fflush.c | 35 +++++++++++++++++++++++++++++++++++ functions/stdio/fflush.c | 26 ++++++++++++++++++-------- 2 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 functions/_PDCLIB/fflush.c diff --git a/functions/_PDCLIB/fflush.c b/functions/_PDCLIB/fflush.c new file mode 100644 index 0000000..3d26b40 --- /dev/null +++ b/functions/_PDCLIB/fflush.c @@ -0,0 +1,35 @@ +/* $Id$ */ + +/* _PDCLIB_fflush( FILE * ) + + This file is part of the Public Domain C Library (PDCLib). + Permission is granted to use, modify, and / or redistribute at will. +*/ + +#include + +int _PDCLIB_fflush( struct _PDCLIB_file_t * stream ) +{ + if ( fwrite( stream->buffer, stream->bufidx, 1, stream ) == stream->bufidx ) + { + stream->bufidx = 0; + return 0; + } + else + { + stream->status |= _PDCLIB_ERRORFLAG; + return EOF; + } +} + +#ifdef TEST +#include <_PDCLIB_test.h> + +int main( void ) +{ + TESTCASE( NO_TESTDRIVER ); + return TEST_RESULTS; +} + +#endif + diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c index 2ddb0ad..5118503 100644 --- a/functions/stdio/fflush.c +++ b/functions/stdio/fflush.c @@ -7,25 +7,35 @@ */ #include -#include <_PDCLIB_glue.h> #ifndef REGTEST +#include <_PDCLIB_glue.h> + +extern struct _PDCLIB_file_t * _PDCLIB_filelist; int fflush( struct _PDCLIB_file_t * stream ) { - /* FIXME: This is ad-hoc. */ - if ( fwrite( stream->buffer, stream->bufidx, 1, stream ) == stream->bufidx ) + if ( stream == NULL ) { - stream->bufidx = 0; - return 0; + stream = _PDCLIB_filelist; + /* TODO: Check what happens when fflush( NULL ) encounters write errors, in other libs */ + int rc = 0; + while ( stream != NULL ) + { + if ( stream->bufidx > stream->bufend ) + { + rc |= _PDCLIB_fflush( stream ); + } + stream = stream->next; + } + return rc; } else { - stream->status |= _PDCLIB_ERRORFLAG; - return EOF; + return _PDCLIB_fflush( stream ); } } - + #endif #ifdef TEST -- 2.40.0