--- strtoumax.c.bsdnew 2009-11-13 14:11:52.000000000 -0800 +++ strtoumax.c 2009-11-13 14:11:52.000000000 -0800 @@ -33,6 +33,8 @@ static char sccsid[] = "from @(#)strtoul #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.11 2007/01/09 00:28:10 imp Exp $"); +#include "xlocale_private.h" + #include <ctype.h> #include <errno.h> #include <stdlib.h> @@ -45,7 +47,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/ * alphabets and digits are each contiguous. */ uintmax_t -strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base) +strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base, + locale_t loc) { const char *s; uintmax_t acc; @@ -53,13 +56,14 @@ strtoumax(const char * __restrict nptr, uintmax_t cutoff; int neg, any, cutlim; + NORMALIZE_LOCALE(loc); /* * See strtoimax 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++; @@ -116,3 +120,9 @@ noconv: *endptr = (char *)(any ? s - 1 : nptr); return (acc); } + +uintmax_t +strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base) +{ + return strtoumax_l(nptr, endptr, base, __current_locale()); +}