X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fungetc.c;h=59d2b57f6a00492e895eba080b261c45ac785f92;hb=HEAD;hp=45b8a92a73e9fc004146ad9d46aae51bd0e9d013;hpb=84d648157e22cecc65902ecfdd4e3a1b88d5e53f;p=pdclib.old

diff --git a/functions/stdio/ungetc.c b/functions/stdio/ungetc.c
index 45b8a92..59d2b57 100644
--- a/functions/stdio/ungetc.c
+++ b/functions/stdio/ungetc.c
@@ -9,8 +9,9 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int ungetc_unlocked( int c, struct _PDCLIB_file_t * stream )
+int _PDCLIB_ungetc_unlocked( int c, FILE * stream )
 {
     if ( c == EOF || stream->ungetidx == _PDCLIB_UNGETCBUFSIZE )
     {
@@ -19,11 +20,11 @@ int ungetc_unlocked( int c, struct _PDCLIB_file_t * stream )
     return stream->ungetbuf[stream->ungetidx++] = (unsigned char) c;
 }
 
-int ungetc( int c, struct _PDCLIB_file_t * stream )
+int ungetc( int c, FILE * stream )
 {
-    flockfile( stream );
-    int r = ungetc_unlocked( c, stream );
-    funlockfile( stream);
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_ungetc_unlocked( c, stream );
+    _PDCLIB_funlockfile( stream);
     return r;
 }
 
@@ -31,10 +32,37 @@ int ungetc( int c, struct _PDCLIB_file_t * stream )
 
 #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;
 }