--- strtoull.c.orig 2003-05-20 15:23:25.000000000 -0700 +++ strtoull.c 2005-02-17 00:52:41.000000000 -0800 @@ -37,6 +37,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp $"); +#include "xlocale_private.h" + #include <limits.h> #include <errno.h> #include <ctype.h> @@ -49,7 +51,8 @@ * alphabets and digits are each contiguous. */ unsigned long long -strtoull(const char * __restrict nptr, char ** __restrict endptr, int base) +strtoull_l(const char * __restrict nptr, char ** __restrict endptr, int base, + locale_t loc) { const char *s; unsigned long long acc; @@ -57,13 +60,14 @@ unsigned long long cutoff; int neg, any, cutlim; + NORMALIZE_LOCALE(loc); /* * See strtoq for comments as to the logic used. */ s = nptr; do { c = *s++; - } while (isspace((unsigned char)c)); + } while (isspace_l((unsigned char)c, loc)); if (c == '-') { neg = 1; c = *s++; @@ -117,3 +121,9 @@ *endptr = (char *)(any ? s - 1 : nptr); return (acc); } + +unsigned long long +strtoull(const char * __restrict nptr, char ** __restrict endptr, int base) +{ + return strtoull_l(nptr, endptr, base, __current_locale()); +}