X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=a9ce3e96e1e6fa3bb6a43aa80357a58a66110a07;hb=3c60673fd7479218b6f8069b848a1f5c2bd10114;hp=0667c990828f7757c124da7b5257faf42b4a47e9;hpb=e1aa1603e598277c4c0cb560ac068ac79c4dc2eb;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 0667c99..a9ce3e9 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -14,44 +14,50 @@
 
 int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
+    /* TODO: This function should interpret format as multibyte characters.  */
     struct _PDCLIB_status_t status;
     status.base = 0;
     status.flags = 0;
-    status.n = 0; 
+    status.n = 0;
     status.i = 0;
-    status.this = 0;
+    status.current = 0;
     status.s = NULL;
     status.width = 0;
     status.prec = 0;
     status.stream = stream;
     va_copy( status.arg, arg );
+
     while ( *format != '\0' )
     {
         const char * rc;
         if ( ( *format != '%' ) || ( ( rc = _PDCLIB_scan( format, &status ) ) == format ) )
         {
+            int c;
             /* No conversion specifier, match verbatim */
             if ( isspace( *format ) )
             {
                 /* Whitespace char in format string: Skip all whitespaces */
-                /* No whitespaces in input do not result in matching error */
-                while ( isspace( *status.s ) )
+                /* No whitespaces in input does not result in matching error */
+                while ( isspace( c = getc( stream ) ) )
                 {
-                    ++status.s;
                     ++status.i;
                 }
+                if ( c != EOF )
+                {
+                    ungetc( c, stream );
+                }
             }
             else
             {
                 /* Non-whitespace char in format string: Match verbatim */
-                if ( *status.s != *format )
+                if ( ( c = getc( stream ) ) != *format )
                 {
                     /* Matching error */
+                    ungetc( c, stream );
                     return status.n;
                 }
                 else
                 {
-                    ++status.s;
                     ++status.i;
                 }
             }
@@ -79,6 +85,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 
 int main( void )
 {
+    /* TODO: Check whitespace / EOF / ungetc handling */
     TESTCASE( NO_TESTDRIVER );
     return TEST_RESULTS;
 }