]> git.saurik.com Git - apple/libc.git/blame - locale/FreeBSD/wcstoimax.c.patch
Libc-498.tar.gz
[apple/libc.git] / locale / FreeBSD / wcstoimax.c.patch
CommitLineData
3d9156a7
A
1--- wcstoimax.c.orig 2003-05-20 15:21:45.000000000 -0700
2+++ wcstoimax.c 2005-02-23 16:06:32.000000000 -0800
3@@ -40,6 +40,8 @@
4 #endif
5 __FBSDID("$FreeBSD: src/lib/libc/locale/wcstoimax.c,v 1.2 2003/01/01 18:48:43 schweikh Exp $");
6
7+#include "xlocale_private.h"
8+
9 #include <errno.h>
10 #include <inttypes.h>
11 #include <stdlib.h>
12@@ -50,8 +52,8 @@
13 * Convert a wide character string to an intmax_t integer.
14 */
15 intmax_t
16-wcstoimax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
17- int base)
18+wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
19+ int base, locale_t loc)
20 {
21 const wchar_t *s;
22 uintmax_t acc;
23@@ -59,13 +61,14 @@
24 uintmax_t cutoff;
25 int neg, any, cutlim;
26
27+ NORMALIZE_LOCALE(loc);
28 /*
29 * See strtoimax for comments as to the logic used.
30 */
31 s = nptr;
32 do {
33 c = *s++;
34- } while (iswspace(c));
35+ } while (iswspace_l(c, loc));
36 if (c == L'-') {
37 neg = 1;
38 c = *s++;
39@@ -92,8 +95,8 @@
40 cutoff /= base;
41 for ( ; ; c = *s++) {
42 #ifdef notyet
43- if (iswdigit(c))
44- c = digittoint(c);
45+ if (iswdigit_l(c, loc))
46+ c = digittoint_l(c, loc);
47 else
48 #endif
49 if (c >= L'0' && c <= L'9')
50@@ -126,3 +129,10 @@
51 *endptr = (wchar_t *)(any ? s - 1 : nptr);
52 return (acc);
53 }
54+
55+intmax_t
56+wcstoimax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
57+ int base)
58+{
59+ return wcstoimax_l(nptr, endptr, base, __current_locale());
60+}