Libc-1082.50.1.tar.gz

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

diff --git a/locale/FreeBSD/wcstol.c b/locale/FreeBSD/wcstol.c
index ae51c2e44b2f423691c0c2b25dfba5fc6a11b4a1..2509e559b31a9a01a5587dbeda90419501ec226e 100644 (file)
--- a/locale/FreeBSD/wcstol.c
+++ b/locale/FreeBSD/wcstol.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.
  * 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.
  * 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.


@@ -32,7 +28,9 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.1 2002/09/08 13:27:26 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
+
+#include "xlocale_private.h"

 
 #include <ctype.h>
 #include <errno.h>
 
 #include <ctype.h>
 #include <errno.h>


@@ -44,7 +42,8 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.1 2002/09/08 13:27:26 tjr E
  * Convert a string to a long integer.
  */
 long
  * Convert a string to a long integer.
  */
 long

-wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
+wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
+    int base, locale_t loc)

 {
        const wchar_t *s;
        unsigned long acc;
 {
        const wchar_t *s;
        unsigned long acc;


@@ -52,13 +51,14 @@ wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
        unsigned long cutoff;
        int neg, any, cutlim;
 
        unsigned long cutoff;
        int neg, any, cutlim;
 

+       NORMALIZE_LOCALE(loc);

        /*
         * See strtol for comments as to the logic used.
         */
        s = nptr;
        do {
                c = *s++;
        /*
         * See strtol for comments as to the logic used.
         */
        s = nptr;
        do {
                c = *s++;

-       } while (iswspace(c));
+       } while (iswspace_l(c, loc));

        if (c == '-') {
                neg = 1;
                c = *s++;
        if (c == '-') {
                neg = 1;
                c = *s++;


@@ -85,8 +85,8 @@ wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
        cutoff /= base;
        for ( ; ; c = *s++) {
 #ifdef notyet
        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')
                else
 #endif
                if (c >= L'0' && c <= L'9')


@@ -119,3 +119,9 @@ noconv:
                *endptr = (wchar_t *)(any ? s - 1 : nptr);
        return (acc);
 }
                *endptr = (wchar_t *)(any ? s - 1 : nptr);
        return (acc);
 }

+
+long
+wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
+{
+       return wcstol_l(nptr, endptr, base, __current_locale());
+}