]> git.saurik.com Git - apple/libc.git/blame_incremental - stdlib/FreeBSD/strtoimax.c.patch
Libc-498.tar.gz
[apple/libc.git] / stdlib / FreeBSD / strtoimax.c.patch
... / ...
CommitLineData
1--- strtoimax.c.orig 2003-05-20 15:23:25.000000000 -0700
2+++ strtoimax.c 2005-02-23 13:20:23.000000000 -0800
3@@ -37,6 +37,8 @@
4 #include <sys/cdefs.h>
5 __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.9 2003/01/01 18:48:43 schweikh Exp $");
6
7+#include "xlocale_private.h"
8+
9 #include <ctype.h>
10 #include <errno.h>
11 #include <stdlib.h>
12@@ -49,7 +51,8 @@
13 * alphabets and digits are each contiguous.
14 */
15 intmax_t
16-strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
17+strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
18+ locale_t loc)
19 {
20 const char *s;
21 uintmax_t acc;
22@@ -57,6 +60,7 @@
23 uintmax_t cutoff;
24 int neg, any, cutlim;
25
26+ NORMALIZE_LOCALE(loc);
27 /*
28 * Skip white space and pick up leading +/- sign if any.
29 * If base is 0, allow 0x for hex and 0 for octal, else
30@@ -65,7 +69,7 @@
31 s = nptr;
32 do {
33 c = *s++;
34- } while (isspace((unsigned char)c));
35+ } while (isspace_l((unsigned char)c, loc));
36 if (c == '-') {
37 neg = 1;
38 c = *s++;
39@@ -139,3 +143,9 @@
40 *endptr = (char *)(any ? s - 1 : nptr);
41 return (acc);
42 }
43+
44+intmax_t
45+strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
46+{
47+ return strtoimax_l(nptr, endptr, base, __current_locale());
48+}