From owner-svn-src-head@FreeBSD.ORG  Sun Apr 22 21:22:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A28821065672;
	Sun, 22 Apr 2012 21:22:14 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E6648FC1C;
	Sun, 22 Apr 2012 21:22:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3MLMEwK059107;
	Sun, 22 Apr 2012 21:22:14 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3MLME3L059104;
	Sun, 22 Apr 2012 21:22:14 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <201204222122.q3MLME3L059104@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sun, 22 Apr 2012 21:22:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234586 - head/lib/libc/stdio
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Apr 2012 21:22:14 -0000

Author: das
Date: Sun Apr 22 21:22:14 2012
New Revision: 234586
URL: http://svn.freebsd.org/changeset/base/234586

Log:
  Bugfix: %n doesn't count as a conversion, so
  sscanf("abc", "ab%ncd", &i) returns EOF, not 0.

Modified:
  head/lib/libc/stdio/vfscanf.c
  head/lib/libc/stdio/vfwscanf.c

Modified: head/lib/libc/stdio/vfscanf.c
==============================================================================
--- head/lib/libc/stdio/vfscanf.c	Sun Apr 22 21:18:41 2012	(r234585)
+++ head/lib/libc/stdio/vfscanf.c	Sun Apr 22 21:22:14 2012	(r234586)
@@ -703,7 +703,6 @@ literal:
 			break;
 
 		case 'n':
-			nconversions++;
 			if (flags & SUPPRESS)	/* ??? */
 				continue;
 			if (flags & SHORTSHORT)

Modified: head/lib/libc/stdio/vfwscanf.c
==============================================================================
--- head/lib/libc/stdio/vfwscanf.c	Sun Apr 22 21:18:41 2012	(r234585)
+++ head/lib/libc/stdio/vfwscanf.c	Sun Apr 22 21:22:14 2012	(r234586)
@@ -650,7 +650,6 @@ literal:
 			break;
 
 		case 'n':
-			nconversions++;
 			if (flags & SUPPRESS)	/* ??? */
 				continue;
 			if (flags & SHORTSHORT)