X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fclearerr.c;h=2b032bd21833c8ff8b7e631882b6cbd1d9339c5e;hb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;hp=922f6ab9d239e18cbf5eea9d959d0102c10d9f54;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib diff --git a/functions/stdio/clearerr.c b/functions/stdio/clearerr.c index 922f6ab..2b032bd 100644 --- a/functions/stdio/clearerr.c +++ b/functions/stdio/clearerr.c @@ -10,11 +10,18 @@ #ifndef REGTEST -void clearerr( struct _PDCLIB_file_t * stream ) +void clearerr_unlocked( struct _PDCLIB_file_t * stream ) { stream->status &= ~( _PDCLIB_ERRORFLAG | _PDCLIB_EOFFLAG ); } +void clearerr( struct _PDCLIB_file_t * stream ) +{ + flockfile( stream ); + clearerr_unlocked( stream ); + funlockfile( stream ); +} + #endif #ifdef TEST @@ -23,12 +30,12 @@ void clearerr( struct _PDCLIB_file_t * stream ) int main( void ) { FILE * fh; - remove( "testfile" ); - TESTCASE( ( fh = fopen( "testfile", "w+" ) ) != NULL ); + TESTCASE( ( fh = tmpfile() ) != NULL ); /* Flags should be clear */ TESTCASE( ! ferror( fh ) ); TESTCASE( ! feof( fh ) ); /* Reading from input stream - should provoke error */ + /* FIXME: Apparently glibc disagrees on this assumption. How to provoke error on glibc? */ TESTCASE( fgetc( fh ) == EOF ); TESTCASE( ferror( fh ) ); TESTCASE( ! feof( fh ) ); @@ -46,7 +53,6 @@ int main( void ) TESTCASE( ! ferror( fh ) ); TESTCASE( ! feof( fh ) ); TESTCASE( fclose( fh ) == 0 ); - remove( "testfile" ); return TEST_RESULTS; }