Tightening the code a bit.

[pdclib] / functions / stdio / fgetc.c

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index c4f2993f533f862878f36ed1faf8ea751d4e7d2a..29522c1d64ee50d917b963a26ae12e082a2fd5c5 100644 (file)
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -1,22 +1,39 @@
-// ----------------------------------------------------------------------------
-// $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>
+
+#ifndef REGTEST
 
-    ret = fread(x, 1, 1, stream);
-    if (ret == 0)
+#include <_PDCLIB_glue.h>
+
+int fgetc( struct _PDCLIB_file_t * stream )
+{
+    if ( _PDCLIB_prepread( stream ) == EOF )
+    {
+        return EOF;
+    }
+    if ( stream->ungetidx > 0 )
     {
-        return (EOF);
+        return (unsigned char)stream->ungetbuf[ --(stream->ungetidx) ];
     }
-    return ((int)x[0]);
+    return (unsigned char)stream->buffer[stream->bufidx++];
 }
-*/
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    /* Testing covered by ftell.c */
+    return TEST_RESULTS;
+}
+
+#endif