Libc-1081.1.3.tar.gz

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

diff --git a/stdlib/FreeBSD/strtoumax.c b/stdlib/FreeBSD/strtoumax.c
index eb714d7fcba625930e401acd191bd467c4aeeefc..22400a5532db965c4924cf270bf5f8f175988830 100644 (file)
--- a/stdlib/FreeBSD/strtoumax.c
+++ b/stdlib/FreeBSD/strtoumax.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.


@@ -35,7 +31,9 @@
 static char sccsid[] = "from @(#)strtoul.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "from @(#)strtoul.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp $");
+__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 <ctype.h>
 #include <errno.h>


@@ -49,7 +47,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tj
  * alphabets and digits are each contiguous.
  */
 uintmax_t
  * 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;
 {
        const char *s;
        uintmax_t acc;


@@ -57,13 +56,14 @@ strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base)
        uintmax_t cutoff;
        int neg, any, cutlim;
 
        uintmax_t cutoff;
        int neg, any, cutlim;
 

+       NORMALIZE_LOCALE(loc);

        /*
         * See strtoimax for comments as to the logic used.
         */
        s = nptr;
        do {
                c = *s++;
        /*
         * 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++;
        if (c == '-') {
                neg = 1;
                c = *s++;


@@ -73,7 +73,10 @@ strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base)
                        c = *s++;
        }
        if ((base == 0 || base == 16) &&
                        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;
                c = s[1];
                s += 2;
                base = 16;


@@ -117,3 +120,9 @@ noconv:
                *endptr = (char *)(any ? s - 1 : nptr);
        return (acc);
 }
                *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());
+}