X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=16ea59283ef520755a1fecf6b31e18b4ef48febe;hb=8a292a8d4b146cc31c81ed21a1925aa10fb6c206;hp=8b3a8f74c62426b7a0d029113738f79300c294e9;hpb=6089d8ab77f6f7bacbfa6354e8cfecab1b00c8bc;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 8b3a8f7..16ea592 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -14,45 +14,40 @@
 
 int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
-    struct _PDCLIB_status_t status;
-    status.base = 0;
-    status.flags = 0;
-    status.n = 0; 
-    status.i = 0;
-    status.current = 0;
-    status.s = NULL;
-    status.width = 0;
-    status.prec = 0;
-    status.stream = stream;
+    /* base, flags, n, i, current, s, width, prec, stream, arg */
+    struct _PDCLIB_status_t status = { 0, 0, 0, 0, 0, NULL, 0, 0, stream, NULL };
     va_copy( status.arg, arg );
-    // FIXME: This whole shebang should operate on STREAM, not S...
     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;
                 }
             }
@@ -80,6 +75,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;
 }