svn commit: r234586 - head/lib/libc/stdio

[David Schultz]

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)