--- wcstoll.c.orig Tue May 20 15:21:45 2003
+++ wcstoll.c Fri Feb 18 14:54:25 2005
@@ -40,6 +40,8 @@
#endif
__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
+#include "xlocale_private.h"
+
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
@@ -50,7 +52,8 @@
* Convert a wide character string to a long long integer.
*/
long long
-wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
+wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
+ int base, locale_t loc)
{
const wchar_t *s;
unsigned long long acc;
@@ -58,13 +61,14 @@
unsigned long long cutoff;
int neg, any, cutlim;
+ NORMALIZE_LOCALE(loc);
/*
* See strtoll for comments as to the logic used.
*/
s = nptr;
do {
c = *s++;
- } while (iswspace(c));
+ } while (iswspace_l(c, loc));
if (c == L'-') {
neg = 1;
c = *s++;
@@ -91,8 +95,8 @@
cutoff /= base;
for ( ; ; c = *s++) {
#ifdef notyet
- if (iswdigit(c))
- c = digittoint(c);
+ if (iswdigit_l(c, loc))
+ c = digittoint_l(c, loc);
else
#endif
if (c >= L'0' && c <= L'9')
@@ -124,4 +128,10 @@
if (endptr != NULL)
*endptr = (wchar_t *)(any ? s - 1 : nptr);
return (acc);
+}
+
+long long
+wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
+{
+ return wcstoll_l(nptr, endptr, base, __current_locale());
}