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

diff --git a/functions/stdio/clearerr.c b/functions/stdio/clearerr.c
index 4c51d71..91cd00a 100644
--- a/functions/stdio/clearerr.c
+++ b/functions/stdio/clearerr.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* clearerr( FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -18,40 +16,36 @@ void clearerr( struct _PDCLIB_file_t * stream )
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 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;
-    TESTCASE( ferror( fh ) );
-    TESTCASE( ! feof( fh ) );
-    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;
+    /* reopen() the file write-only */
+    TESTCASE( ( fh = freopen( NULL, "w", fh ) ) != NULL );
+    /* Reading from write-only stream - should provoke error */
+    TESTCASE( fgetc( fh ) == EOF );
     TESTCASE( ferror( fh ) );
-    TESTCASE( feof( fh ) );
+    TESTCASE( ! feof( fh ) );
+    /* clearerr() should clear flags */
     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;
 }