X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fclearerr.c;h=2b032bd21833c8ff8b7e631882b6cbd1d9339c5e;hb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;hp=4c51d714f54aefb4c019a6b8c216bd6820d19634;hpb=f603f88b4456cf9b7ab1328bf657ede22a0c9940;p=pdclib

diff --git a/functions/stdio/clearerr.c b/functions/stdio/clearerr.c
index 4c51d71..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
@@ -22,37 +29,32 @@ void clearerr( struct _PDCLIB_file_t * stream )
 
 int main( void )
 {
-#ifndef REGTEST
-    FILE file = { 0, { 0 }, NULL, 0, 0, 0, NULL };
-    FILE * fh = &file;
+    FILE * fh;
+    TESTCASE( ( fh = tmpfile() ) != NULL );
+    /* Flags should be clear */
     TESTCASE( ! ferror( fh ) );
     TESTCASE( ! feof( fh ) );
-    fh->status |= _PDCLIB_ERRORFLAG;
+    /* 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 ) );
+    /* clearerr() should clear flags */
     clearerr( fh );
     TESTCASE( ! ferror( fh ) );
     TESTCASE( ! feof( fh ) );
-    fh->status |= _PDCLIB_EOFFLAG;
+    /* Reading from empty stream - should provoke EOF */
+    rewind( fh );
+    TESTCASE( fgetc( fh ) == EOF );
     TESTCASE( ! ferror( fh ) );
     TESTCASE( feof( fh ) );
+    /* clearerr() should clear flags */
     clearerr( fh );
     TESTCASE( ! ferror( fh ) );
     TESTCASE( ! feof( fh ) );
-    fh->status |= _PDCLIB_EOFFLAG | _PDCLIB_ERRORFLAG;
-    TESTCASE( ferror( fh ) );
-    TESTCASE( feof( fh ) );
-    clearerr( fh );
-    TESTCASE( ! ferror( fh ) );
-    TESTCASE( ! feof( fh ) );
-#else
-    /* TODO: The above is ad-hoc and PDCLib specific. A better test driver
-       should be internals-agnostic (provoking the error / eof flag by
-       "regular" operations).
-    */
-    TESTCASE( NO_TESTDRIVER );
-#endif
+    TESTCASE( fclose( fh ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+