X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fclearerr.c;h=20af80f298b4a1e792e6e8de80b5cce58f4e977a;hb=0e35e82c5e9a0804864839e8fc0e985b1ae41f07;hp=28a042d8bd12affa09be2ea7d11737a5931f8ec2;hpb=c8f799d852e3698468a78954d82588e841cc0b70;p=pdclib.old

diff --git a/functions/stdio/clearerr.c b/functions/stdio/clearerr.c
index 28a042d..20af80f 100644
--- a/functions/stdio/clearerr.c
+++ b/functions/stdio/clearerr.c
@@ -1,18 +1,61 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
-
-#ifndef __FILE_H
-#define __FILE_H __FILE_H
-#include <__FILE.h>
-#endif // __FILE_H
-
-void clearerr( FILE * fh )
+/* $Id$ */
+
+/* clearerr( FILE * )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+
+#ifndef REGTEST
+#include <_PDCLIB_io.h>
+
+void clearerr_unlocked( FILE * stream )
+{
+    stream->status &= ~( _PDCLIB_ERRORFLAG | _PDCLIB_EOFFLAG );
+}
+
+void clearerr( FILE * stream )
 {
-    fh->ErrorIndicator = 0;
-    fh->EOFIndicator = 0;
-    return;
+    flockfile( stream );
+    clearerr_unlocked( stream );
+    funlockfile( stream );
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    FILE * fh;
+    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 ) );
+    /* clearerr() should clear flags */
+    clearerr( fh );
+    TESTCASE( ! ferror( fh ) );
+    TESTCASE( ! feof( fh ) );
+    /* 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 ) );
+    TESTCASE( fclose( fh ) == 0 );
+    return TEST_RESULTS;
+}
+
+#endif
+