X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstdio%2Fungetc.c;h=2e556ab4f9c16f5985c3bf7929f6c885e9a140c8;hb=59953f20c461a26fd6f0be8c28c784709da51a5e;hp=001735b533c04361648b2c3eb5475cdced99faac;hpb=526e9954c39f30819e421cb74e82aa59d5a41013;p=pdclib

diff --git a/functions/stdio/ungetc.c b/functions/stdio/ungetc.c
index 001735b..2e556ab 100644
--- a/functions/stdio/ungetc.c
+++ b/functions/stdio/ungetc.c
@@ -10,7 +10,7 @@
 
 #ifndef REGTEST
 
-int ungetc( int c, struct _PDCLIB_file_t * stream )
+int ungetc_unlocked( int c, struct _PDCLIB_file_t * stream )
 {
     if ( c == EOF || stream->ungetidx == _PDCLIB_UNGETCBUFSIZE )
     {
@@ -19,14 +19,48 @@ int ungetc( int c, struct _PDCLIB_file_t * stream )
     return stream->ungetbuf[stream->ungetidx++] = (unsigned char) c;
 }
 
+int ungetc( int c, struct _PDCLIB_file_t * stream )
+{
+    flockfile( stream );
+    int r = ungetc_unlocked( c, stream );
+    funlockfile( stream);
+    return r;
+}
+
 #endif
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+const char* hellostr = "Hello, world!";
+
 int main( void )
 {
-    /* Testing covered by ftell.c */
+    // Also see ftell() for some testing
+
+    // PDCLIB-18: fread ignores ungetc
+    size_t bufsz = strlen( hellostr ) + 1;
+    char * buf = malloc( bufsz );
+    FILE * fh;
+
+    // Also fgets
+    TESTCASE( ( fh = tmpfile() ) != NULL );
+    TESTCASE( fputs(hellostr, fh) == 0 );
+    rewind(fh);
+    TESTCASE( fgetc( fh ) == 'H' );
+    TESTCASE( ungetc( 'H', fh ) == 'H' );
+    TESTCASE( fgets( buf, bufsz, fh ) != NULL );
+    TESTCASE( strcmp( buf, hellostr ) == 0 );
+
+    // fread
+    rewind(fh);
+    TESTCASE( fgetc( fh ) == 'H' );
+    TESTCASE( ungetc( 'H', fh ) == 'H' );
+    TESTCASE( fread( buf, bufsz - 1, 1, fh ) == 1 );
+    TESTCASE( strncmp( buf, hellostr, bufsz - 1 ) == 0 );
+
+
+
     return TEST_RESULTS;
 }