Merged branch stdio_rewrite back into trunk.

[pdclib] / functions / stdio / fgetc.c

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index 900cd0a12181a2f7f3e53df03d3538a53952a0b3..1a90eb95dadea9780b28a024c6fb94c9bad99570 100644 (file)
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -8,12 +8,21 @@
 
 #include <stdio.h>
 
+#include <_PDCLIB_glue.h>
+
 #ifndef REGTEST
 
 int fgetc( struct _PDCLIB_file_t * stream )
 {
-    /* TODO: Implement. */
-    return 0;
+    if ( _PDCLIB_prepread( stream ) == EOF )
+    {
+        return EOF;
+    }
+    if ( stream->ungetidx > 0 )
+    {
+        return stream->ungetbuf[ stream->ungetidx-- ];
+    }
+    return stream->buffer[stream->bufidx++];
 }
 
 #endif
@@ -23,7 +32,7 @@ int fgetc( struct _PDCLIB_file_t * stream )
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    /* Testing covered by ftell.c */
     return TEST_RESULTS;
 }