X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fungetc.c;h=56ba98b26c3b463ba08bd7f7bdd993a2fd93b6b9;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=f85ca9ce96344f423a096807ce6a42cbafc22acc;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib

diff --git a/functions/stdio/ungetc.c b/functions/stdio/ungetc.c
index f85ca9c..56ba98b 100644
--- a/functions/stdio/ungetc.c
+++ b/functions/stdio/ungetc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* ungetc( int, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,8 +7,9 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int ungetc( int c, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+int _PDCLIB_ungetc_unlocked( int c, FILE * stream )
 {
     if ( c == EOF || stream->ungetidx == _PDCLIB_UNGETCBUFSIZE )
     {
@@ -19,14 +18,49 @@ int ungetc( int c, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
     return stream->ungetbuf[stream->ungetidx++] = (unsigned char) c;
 }
 
+int ungetc( int c, FILE * stream )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_ungetc_unlocked( c, stream );
+    _PDCLIB_funlockfile( stream);
+    return r;
+}
+
 #endif
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+#include <stdlib.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;
 }