From: Jeff Johnston <jjohnstn@redhat.com>
Date: Fri, 11 Jan 2002 22:06:09 +0000 (+0000)
Subject: 2002-01-11 Jeff Johnston  <jjohnstn@redhat.com>
X-Git-Tag: cygwin_daemon_merge_HEAD~186
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=798c015d114223b53caf5affb5820dbecb69dc4d;p=newlib-cygwin.git

2002-01-11 Jeff Johnston  <jjohnstn@redhat.com>

        * libc/stdio/vfscanf.c (__svfscanf_r): Change loop that
        reads blanks from the input file to break if EOF reached
        rather than end processing.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 48134073c..c4ad7ccce 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-11 Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/stdio/vfscanf.c (__svfscanf_r): Change loop that
+	reads blanks from the input file to break if EOF reached
+	rather than end processing.
+
 2002-01-07 Jeff Johnston  <jjohnstn@redhat.com>
 
 	* MAINTAINERS: Change e-mail addresses to refer to redhat domain.
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 8f49141f1..f6c3c930b 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -292,9 +292,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
 	{
 	  for (;;)
 	    {
-	      if (BufferEmpty)
-		return nassigned;
-	      if (!isspace (*fp->_p))
+	      if (BufferEmpty || !isspace (*fp->_p))
 		break;
 	      nread++, fp->_r--, fp->_p++;
 	    }