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.

diff --git a/src/stdlib/wcstoimax.c b/src/stdlib/wcstoimax.c
index b83206b7b562bb8125501344a9ba81cdd74f1491..50647f6223ee31db1f2d23d2fc8d337bebb8cacf 100644 (file)
--- a/src/stdlib/wcstoimax.c
+++ b/src/stdlib/wcstoimax.c
@@ -7,7 +7,6 @@
 intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
 {
        struct intparse ip = {0};
-       unsigned char tmp;
 
        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++);
 
        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)
                *p = (wchar_t *)s;

diff --git a/src/stdlib/wcstoumax.c b/src/stdlib/wcstoumax.c
index e30b063847ce5b6efe3d8564d22a07400685dbe3..af7ba3dc9fe1b8deabc5e3009663d44e8f787217 100644 (file)
--- a/src/stdlib/wcstoumax.c
+++ b/src/stdlib/wcstoumax.c
@@ -8,7 +8,6 @@
 uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base)
 {
        struct intparse ip = {0};
-       unsigned char tmp;
 
        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++);
 
        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)
                *p = (wchar_t *)s;