Libc-1044.1.2.tar.gz

[apple/libc.git] / stdlib / FreeBSD / strtoll.c

diff --git a/stdlib/FreeBSD/strtoll.c b/stdlib/FreeBSD/strtoll.c
index cff57d98a21864030853fe150eb3f3f0a06d2bad..f7e11f3cb2d45515e687ed598d4cd2dd9fde1e60 100644 (file)
--- a/stdlib/FreeBSD/strtoll.c
+++ b/stdlib/FreeBSD/strtoll.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.
@@ -35,7 +31,9 @@
 static char sccsid[] = "@(#)strtoq.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.22 2007/01/09 00:28:10 imp Exp $");
+
+#include "xlocale_private.h"
 
 #include <limits.h>
 #include <errno.h>
@@ -49,7 +47,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr
  * alphabets and digits are each contiguous.
  */
 long long
-strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
+strtoll_l(const char * __restrict nptr, char ** __restrict endptr, int base,
+    locale_t loc)
 {
        const char *s;
        unsigned long long acc;
@@ -57,6 +56,7 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
        unsigned long long cutoff;
        int neg, any, cutlim;
 
+       NORMALIZE_LOCALE(loc);
        /*
         * Skip white space and pick up leading +/- sign if any.
         * If base is 0, allow 0x for hex and 0 for octal, else
@@ -65,7 +65,7 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
        s = nptr;
        do {
                c = *s++;
-       } while (isspace((unsigned char)c));
+       } while (isspace_l((unsigned char)c, loc));
        if (c == '-') {
                neg = 1;
                c = *s++;
@@ -75,7 +75,10 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
                        c = *s++;
        }
        if ((base == 0 || base == 16) &&
-           c == '0' && (*s == 'x' || *s == 'X')) {
+           c == '0' && (*s == 'x' || *s == 'X') &&
+           ((s[1] >= '0' && s[1] <= '9') ||
+           (s[1] >= 'A' && s[1] <= 'F') ||
+           (s[1] >= 'a' && s[1] <= 'f'))) {
                c = s[1];
                s += 2;
                base = 16;
@@ -139,3 +142,9 @@ noconv:
                *endptr = (char *)(any ? s - 1 : nptr);
        return (acc);
 }
+
+long long
+strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
+{
+       return strtoll_l(nptr, endptr, base, __current_locale());
+}