X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffgetc.c;h=ae7a8356685540e2582a1c5dcc7a9b350a530c18;hb=84d648157e22cecc65902ecfdd4e3a1b88d5e53f;hp=1a90eb95dadea9780b28a024c6fb94c9bad99570;hpb=0d54a75af25ca44411e7c4190cc2a93a390e61a2;p=pdclib.old

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index 1a90eb9..ae7a835 100644
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -8,11 +8,11 @@
 
 #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 )
     {
@@ -20,9 +20,17 @@ int fgetc( struct _PDCLIB_file_t * stream )
     }
     if ( stream->ungetidx > 0 )
     {
-        return stream->ungetbuf[ stream->ungetidx-- ];
+        return (unsigned char)stream->ungetbuf[ --(stream->ungetidx) ];
     }
-    return stream->buffer[stream->bufidx++];
+    return (unsigned char)stream->buffer[stream->bufidx++];
+}
+
+int fgetc( struct _PDCLIB_file_t * stream )
+{
+    flockfile( stream );
+    int c = fgetc_unlocked( stream );
+    funlockfile( stream );
+    return c;
 }
 
 #endif