mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-18 20:39:33 +08:00
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.
This commit is contained in:
parent
206473437f
commit
236e5c4017
@ -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>
|
||||
|
||||
* libc/stdlib/ldtoa.c (etoasc): Fix rounding to even when fraction
|
||||
|
@ -822,6 +822,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
|
||||
/* scan arbitrary characters (sets NOSKIP) */
|
||||
if (width == 0)
|
||||
width = 1;
|
||||
#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
|
||||
if (flags & LONG)
|
||||
{
|
||||
if ((flags & SUPPRESS) == 0)
|
||||
@ -860,7 +861,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
|
||||
if (!(flags & SUPPRESS))
|
||||
nassigned++;
|
||||
}
|
||||
else if (flags & SUPPRESS)
|
||||
else
|
||||
#endif
|
||||
if (flags & SUPPRESS)
|
||||
{
|
||||
size_t sum = 0;
|
||||
for (;;)
|
||||
@ -950,6 +953,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
|
||||
/* like CCL, but zero-length string OK, & no NOSKIP */
|
||||
if (width == 0)
|
||||
width = (size_t)~0;
|
||||
#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
|
||||
if (flags & LONG)
|
||||
{
|
||||
/* Process %S and %ls placeholders */
|
||||
@ -998,7 +1002,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
|
||||
nassigned++;
|
||||
}
|
||||
}
|
||||
else if (flags & SUPPRESS)
|
||||
else
|
||||
#endif
|
||||
if (flags & SUPPRESS)
|
||||
{
|
||||
n = 0;
|
||||
while (!isspace (*fp->_p))
|
||||
|
Loading…
x
Reference in New Issue
Block a user