X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffgetc.c;h=56e96f5eca481fbdf88136fe42ffa5c03d29dcf5;hb=0e35e82c5e9a0804864839e8fc0e985b1ae41f07;hp=b5a32572158fd89dc2875d65dfca75407073d231;hpb=31a65ba85aad0203b017b57fed050947ee2d9bd7;p=pdclib.old

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index b5a3257..56e96f5 100644
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -8,21 +8,29 @@
 
 #include <stdio.h>
 
-#include <_PDCLIB_glue.h>
-
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fgetc( struct _PDCLIB_file_t * stream )
+int 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 )
+{
+    flockfile( stream );
+    int c = fgetc_unlocked( stream );
+    funlockfile( stream );
+    return c;
 }
 
 #endif