Proper handling of end-of-string.

git-svn-id: https://srv7.svn-repos.de/dev34/pdclib/trunk@445 546481bc-9713-0410-bf18-d3337bbf4a3e

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 8a2379026af56d13040fff21589cc8247bc365ff..be9bf61ae16ba5c699e718fc2d5285fa708c17b8 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -48,6 +48,11 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
                 /* Non-whitespace char in format string: Match verbatim */
                 if ( *status.s != *format )
                 {
+                    if ( *status.s == '\0' && status.n == 0 )
+                    {
+                        /* Early input error */
+                        return EOF;
+                    }
                     /* Matching error */
                     return status.n;
                 }
@@ -61,9 +66,13 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
         }
         else
         {
-            /* NULL return code indicates input error */
+            /* NULL return code indicates error */
             if ( rc == NULL )
             {
+                if ( ( *status.s == '\n' ) && ( status.n == 0 ) )
+                {
+                    status.n = EOF;
+                }
                 break;
             }
             /* Continue parsing after conversion specifier */