X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffgetc.c;h=0b042c7d5be8506396f43f61a19b144570caa024;hp=29522c1d64ee50d917b963a26ae12e082a2fd5c5;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=44db4763a69211be0afa0b336adbb16a0b10f2cb

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index 29522c1..0b042c7 100644
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fgetc( FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,26 +7,34 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
 
-#include <_PDCLIB_glue.h>
-
-int fgetc( struct _PDCLIB_file_t * stream )
+int _PDCLIB_fgetc_unlocked( FILE * stream )
 {
     if ( _PDCLIB_prepread( stream ) == EOF )
     {
         return EOF;
     }
-    if ( stream->ungetidx > 0 )
-    {
-        return (unsigned char)stream->ungetbuf[ --(stream->ungetidx) ];
-    }
-    return (unsigned char)stream->buffer[stream->bufidx++];
+
+    char c;
+
+    size_t n = _PDCLIB_getchars( &c, 1, EOF, stream );
+
+    return n == 0 ? EOF : (unsigned char) c;
+}
+
+int fgetc( FILE * stream )
+{
+    _PDCLIB_flockfile( stream );
+    int c = _PDCLIB_fgetc_unlocked( stream );
+    _PDCLIB_funlockfile( stream );
+    return c;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {