Libc-1082.20.4.tar.gz

[apple/libc.git] / locale / FreeBSD / wcstoll.c

diff --git a/locale/FreeBSD/wcstoll.c b/locale/FreeBSD/wcstoll.c
index a48056cddc8d1b3afab2a17271dfdd0924fa4310..af50ca8a6f5b33498fff3a88d3b5c0a773de2d45 100644 (file)
--- a/locale/FreeBSD/wcstoll.c
+++ b/locale/FreeBSD/wcstoll.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,9 @@ static char sccsid[] = "@(#)strtoq.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
+
+#include "xlocale_private.h"
 
 #include <errno.h>
 #include <limits.h>
@@ -50,7 +48,8 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.1 2002/09/22 08:06:45 tjr
  * 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 +57,14 @@ wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
        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 +91,8 @@ wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
        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')
@@ -125,3 +125,9 @@ noconv:
                *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());
+}