Minimize the amount of internal definitions which get exposed via the user-visible...

[pdclib.old] / functions / stdio / fgetc.c

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index ba7f8ffa35e1efd7a1cf1d84b024b07e0d67624c..56e96f5eca481fbdf88136fe42ffa5c03d29dcf5 100644 (file)
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -1,22 +1,47 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int fgetc( FILE * stream ) { /* TODO */ };
+/* fgetc( FILE * )
 
-/* PDPC code - unreviewed
-{
-    unsigned char x[1];
-    size_t ret;
+   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>
 
-    ret = fread(x, 1, 1, stream);
-    if (ret == 0)
+#ifndef REGTEST
+#include <_PDCLIB_io.h>
+
+int fgetc_unlocked( FILE * stream )
+{
+    if ( _PDCLIB_prepread( stream ) == EOF )
     {
-        return (EOF);
+        return EOF;
     }
-    return ((int)x[0]);
+
+    char c;
+
+    size_t n = _PDCLIB_getchars( &c, 1, EOF, stream );
+
+    return n == 0 ? EOF : (unsigned char) c;
 }
-*/
+
+int fgetc( FILE * stream )
+{
+    flockfile( stream );
+    int c = fgetc_unlocked( stream );
+    funlockfile( stream );
+    return c;
+}
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    /* Testing covered by ftell.c */
+    return TEST_RESULTS;
+}
+
+#endif