JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2008-10-15 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* libc/stdio/vfscanf.c (__ssvfiscanf_r): Do not support %lc, %C, %ls or
	%S conversions when the EL/IX level is 1.
This commit is contained in:
Jeff Johnston 2008-10-15 19:33:10 +00:00
parent 206473437f
commit 236e5c4017
2 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2008-10-15 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdio/vfscanf.c (__ssvfiscanf_r): Do not support %lc, %C, %ls or
%S conversions when the EL/IX level is 1.
2008-10-06 Eric Blake <ebb9@byu.net> 2008-10-06 Eric Blake <ebb9@byu.net>
* libc/stdlib/ldtoa.c (etoasc): Fix rounding to even when fraction * libc/stdlib/ldtoa.c (etoasc): Fix rounding to even when fraction

10
newlib/libc/stdio/vfscanf.c
View File

@ -822,6 +822,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
/* scan arbitrary characters (sets NOSKIP) */ /* scan arbitrary characters (sets NOSKIP) */
if (width == 0) if (width == 0)
width = 1; width = 1;
#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
if (flags & LONG) if (flags & LONG)
{ {
if ((flags & SUPPRESS) == 0) if ((flags & SUPPRESS) == 0)
@ -860,7 +861,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
if (!(flags & SUPPRESS)) if (!(flags & SUPPRESS))
nassigned++; nassigned++;
} }
else if (flags & SUPPRESS) else
#endif
if (flags & SUPPRESS)
{ {
size_t sum = 0; size_t sum = 0;
for (;;) for (;;)
@ -950,6 +953,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
/* like CCL, but zero-length string OK, & no NOSKIP */ /* like CCL, but zero-length string OK, & no NOSKIP */
if (width == 0) if (width == 0)
width = (size_t)~0; width = (size_t)~0;
#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
if (flags & LONG) if (flags & LONG)
{ {
/* Process %S and %ls placeholders */ /* Process %S and %ls placeholders */
@ -998,7 +1002,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
nassigned++; nassigned++;
} }
} }
else if (flags & SUPPRESS) else
#endif
if (flags & SUPPRESS)
{ {
n = 0; n = 0;
while (!isspace (*fp->_p)) while (!isspace (*fp->_p))