lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2001-08-09  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfscanf.c: Fix handling of %[] for COMPILE_WSCANF.
	* libio/Makefile (tests): Add tst-swscanf.
	* libio/tst-swscanf.c: New file.
This commit is contained in:
Ulrich Drepper
2001-08-09 19:10:37 +00:00
parent 3926e63db2
commit cc7f258f32
4 changed files with 143 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
stdio-common/vfscanf.c
View File

@ -1925,7 +1925,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
be punished. */
tw = (wchar_t *) f; /* Marks the beginning. */
if (*f == ']' || *f == '-')
if (*f == L']')
++f;
while ((fc = *f++) != L'\0' && fc != L']');
@ -1985,7 +1985,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
runp = tw;
while (runp < wp)
{
if (runp[0] == L'-' && runp[1] != '\0' && runp[1] != ']'
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
&& runp != tw
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
{
@ -1993,32 +1993,40 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
first and last character of the sequence. */
wchar_t wc;
for (wc = runp[-1] + 1; wc < runp[1]; ++wc)
for (wc = runp[-1] + 1; wc <= runp[1]; ++wc)
if (wc == c)
break;
if (wc == runp[1] && !not_in)
if (wc <= runp[1] && !not_in)
break;
if (wc == runp[1] && not_in)
if (wc <= runp[1] && not_in)
{
/* The current character is not in the
scanset. */
ungetwc (c, s);
goto out;
}
runp += 2;
}
else
{
if (*runp == runp[1] && !not_in)
if (*runp == c && !not_in)
break;
if (*runp != runp[1] && not_in)
if (*runp == c && not_in)
{
ungetwc (c ,s);
ungetwc (c, s);
goto out;
}
}
++runp;
++runp;
}
}
if (runp == wp && !not_in)
{
ungetwc (c, s);
goto out;
}
if (!(flags & SUPPRESS))
@ -2195,7 +2203,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
runp = tw;
while (runp < wp)
{
if (runp[0] == L'-' && runp[1] != '\0' && runp[1] != ']'
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp
&& runp != tw
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
{
@ -2203,32 +2211,40 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
first and last character of the sequence. */
wchar_t wc;
for (wc = runp[-1] + 1; wc < runp[1]; ++wc)
for (wc = runp[-1] + 1; wc <= runp[1]; ++wc)
if (wc == c)
break;
if (wc == runp[1] && !not_in)
if (wc <= runp[1] && !not_in)
break;
if (wc == runp[1] && not_in)
if (wc <= runp[1] && not_in)
{
/* The current character is not in the
scanset. */
ungetwc (c, s);
goto out2;
}
runp += 2;
}
else
{
if (*runp == runp[1] && !not_in)
if (*runp == c && !not_in)
break;
if (*runp != runp[1] && not_in)
if (*runp == c && not_in)
{
ungetwc (c ,s);
ungetwc (c, s);
goto out2;
}
}
++runp;
++runp;
}
}
if (runp == wp && !not_in)
{
ungetwc (c, s);
goto out2;
}
if (!(flags & SUPPRESS))