X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffgetc.c;h=dc8dfed01c281238cfcede7da3707aaf518ce28c;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=ae7a8356685540e2582a1c5dcc7a9b350a530c18;hpb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;p=pdclib

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index ae7a835..dc8dfed 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,27 +7,27 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-#include <_PDCLIB_glue.h>
-
-int fgetc_unlocked( 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( struct _PDCLIB_file_t * stream )
+int fgetc( FILE * stream )
 {
-    flockfile( stream );
-    int c = fgetc_unlocked( stream );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    int c = _PDCLIB_fgetc_unlocked( stream );
+    _PDCLIB_funlockfile( stream );
     return c;
 }