From: solar <solar@546481bc-9713-0410-bf18-d3337bbf4a3e>
Date: Mon, 19 Jul 2010 05:19:04 +0000 (+0000)
Subject: scanf() returns -1 on early input error.
X-Git-Url: https://git.gag.com/?p=fw%2Fpdclib;a=commitdiff_plain;h=42d46c816926c250e287fe8500132ec3bab0c749

scanf() returns -1 on early input error.

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

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 8f121e9..e1c8b4b 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -53,10 +53,14 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
                 if ( ( ( c = getc( stream ) ) != *format ) || feof( stream ) ) /* TODO: Check EOF status directly */
                 {
                     /* Matching error */
-                    if ( ! feof( stream ) ) /* TODO: Check EOF status directly */
+                    if ( ! feof( stream ) && ! ferror( stream ) ) /* TODO: Check EOF status directly */
                     {
                         ungetc( c, stream );
                     }
+                    else if ( status.n == 0 )
+                    {
+                        return EOF;
+                    }
                     return status.n;
                 }
                 else