#include <stdio.h>
-#include <_PDCLIB_glue.h>
-
#ifndef REGTEST
-int fgetc( struct _PDCLIB_file_t * stream )
+#include <_PDCLIB_glue.h>
+
+int fgetc_unlocked( struct _PDCLIB_file_t * stream )
{
if ( _PDCLIB_prepread( stream ) == EOF )
{
return EOF;
}
- if ( stream->ungetidx > 0 )
- {
- return stream->ungetbuf[ --(stream->ungetidx) ];
- }
- return 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 )
+{
+ flockfile( stream );
+ int c = fgetc_unlocked( stream );
+ funlockfile( stream );
+ return c;
}
#endif