From 114cb5b35711a06874931458aaef95050d4f3e5d Mon Sep 17 00:00:00 2001
From: das <das@FreeBSD.org>
Date: Sun, 22 Apr 2012 21:28:14 +0000
Subject: Bugfix: Correctly count the number of characters read for %l[
 conversions.

---
 lib/libc/stdio/vfscanf.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'lib/libc/stdio/vfscanf.c')

diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index f9b7e55..6a6b19c 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -248,12 +248,12 @@ convert_wccl(FILE *fp, wchar_t *wcp, int width, const char *ccltab)
 {
 	mbstate_t mbs;
 	wchar_t twc;
-	int n, nchars, nconv, nread;
+	int n, nchars, nconv;
 	char buf[MB_CUR_MAX];
 
 	if (wcp == SUPPRESS_PTR)
 		wcp = &twc;
-	n = nread = 0;
+	n = 0;
 	nchars = 0;
 	while (width != 0) {
 		if (n == MB_CUR_MAX) {
@@ -279,7 +279,6 @@ convert_wccl(FILE *fp, wchar_t *wcp, int width, const char *ccltab)
 				}
 				break;
 			}
-			nread += n;
 			width--;
 			if (wcp != &twc)
 				wcp++;
@@ -298,12 +297,10 @@ convert_wccl(FILE *fp, wchar_t *wcp, int width, const char *ccltab)
 		fp->_flags |= __SERR;
 		return (-1);
 	}
-	n = nchars;
-	if (n == 0)
+	if (nchars == 0)
 		return (0);
 	*wcp = L'\0';
-	/* XXX This matches historical behavior, but it's wrong. */
-	return (nread + n);
+	return (nchars);
 }
 
 static __inline int
-- 
cgit v1.1