d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch to properly sscanf(3) when there is whitespace in the format

Browse Source 
string.  From the submitted patch:

Credit for patch:	Chris Torek <torek@bsdi.com>
			Tod Miller  <millert@openbsd.org>

This makes us in line with SunOS 4.1.3_U1, Solaris 2.6, OpenBSD 2.3,
HP-UX 10.20, Irix 5.3.  The previous behavior was in line with Ultrix 4.4.

PR:		bin/7970
Submitted by:	Niall Smart nialls@euristix.ie
This commit is contained in:
David E. O'Brien 1998-09-25 12:20:27 +00:00
parent a3cd018562
commit 5846581c2e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libc/stdio/vfscanf.c
View File

@ -39,7 +39,7 @@
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
"$Id: vfscanf.c,v 1.11 1997/07/01 17:46:39 jkh Exp $";
"$Id: vfscanf.c,v 1.12 1997/11/23 06:02:47 bde Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@ -137,13 +137,8 @@ __svfscanf(fp, fmt0, ap)
if (c == 0)
return (nassigned);
if (isspace(c)) {
for (;;) {
if (fp->_r <= 0 && __srefill(fp))
goto input_failure;
if (!isspace(*fp->_p))
break;
while ((fp->_r > 0 || __srefill(fp) == 0) && isspace(*fp->_p))
nread++, fp->_r--, fp->_p++;
}
continue;
}
if (c != '%')