Browse Source

fix wcsto[iu]max with high characters

stopping without letting the parser see a stop character prevented
getting a result. so treat all high chars as the null character and
pass them into the parser.

also eliminated ugly tmp var using compound literals.
rs-1.0
Rich Felker 15 years ago
parent
commit
d3fd192523
  1. 3
      src/stdlib/wcstoimax.c
  2. 3
      src/stdlib/wcstoumax.c

3
src/stdlib/wcstoimax.c

@ -7,7 +7,6 @@
intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base) intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
{ {
struct intparse ip = {0}; struct intparse ip = {0};
unsigned char tmp;
if (p) *p = (wchar_t *)s; if (p) *p = (wchar_t *)s;
@ -19,7 +18,7 @@ intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
for (; iswspace(*s); s++); for (; iswspace(*s); s++);
ip.base = base; ip.base = base;
for (; *s<256 && (tmp=*s, __intparse(&ip, &tmp, 1)); s++); for (; __intparse(&ip, (char[]){(*s&-(*s<128U))}, 1); s++);
if (p && ip.err != EINVAL) if (p && ip.err != EINVAL)
*p = (wchar_t *)s; *p = (wchar_t *)s;

3
src/stdlib/wcstoumax.c

@ -8,7 +8,6 @@
uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base) uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base)
{ {
struct intparse ip = {0}; struct intparse ip = {0};
unsigned char tmp;
if (p) *p = (wchar_t *)s; if (p) *p = (wchar_t *)s;
@ -20,7 +19,7 @@ uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base)
for (; iswspace(*s); s++); for (; iswspace(*s); s++);
ip.base = base; ip.base = base;
for (; *s<256 && (tmp=*s, __intparse(&ip, &tmp, 1)); s++); for (; __intparse(&ip, (char[]){(*s&-(*s<128U))}, 1); s++);
if (p && ip.err != EINVAL) if (p && ip.err != EINVAL)
*p = (wchar_t *)s; *p = (wchar_t *)s;

Loading…
Cancel
Save