X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffscanf.c;h=6ea4866452bebfa70c0b7c8aa13768257edbfbc5;hb=0b5f84a52cf54e88b99a44efc6f5f2c46e9b294d;hp=39962573100444c39e1d3efeb1875043ddf46dcd;hpb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;p=pdclib

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index 3996257..6ea4866 100644
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* fscanf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,9 +13,12 @@
 
 int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfscanf( stream, format, ap );
+    rc = vfscanf( stream, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
@@ -25,9 +26,27 @@ int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <limits.h>
+#include <string.h>
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char teststring1[] = "  1 23\045\0\067 ";
+    char buffer[15];
+    FILE * fh;
+    TESTCASE( ( fh = fopen( "testfile", "w+" ) ) != NULL );
+    TESTCASE( fwrite( teststring1, 15, 1, fh ) == 1 );
+    rewind( fh );
+    /* */
+    TESTCASE( memset( buffer, CHAR_MAX, 15 ) == buffer ); \
+    TESTCASE( fseek( fh, 0, SEEK_SET ) == 0 ); \
+    TESTCASE( fscanf( fh, "%14c", buffer ) == 1 ); \
+    TESTCASE( memcmp( buffer, teststring1 + 0, 14 ) == 0 ); \
+    TESTCASE( buffer[ 14 ] == CHAR_MAX ); \
+    TESTCASE( memset( buffer, CHAR_MAX, 15 ) == buffer ); \
+    TESTCASE( sscanf( teststring1 + 14, "%14c", buffer ) ); \
+    TESTCASE( memcmp( buffer, teststring1 + 0, 14 ) == 0 ); \
+    TESTCASE( buffer[ 14 ] == CHAR_MAX );
     return TEST_RESULTS;
 }