]> git.saurik.com Git - apple/libc.git/blame - locale/FreeBSD/table.c.patch
projects / apple / libc.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Libc-391.tar.gz
[apple/libc.git] / locale / FreeBSD / table.c.patch
CommitLineData
3d9156a7
A		 1--- table.c.orig 2004-11-25 11:38:19.000000000 -0800
2+++ table.c 2005-02-20 16:31:30.000000000 -0800
3@@ -40,11 +40,14 @@
4 #include <sys/cdefs.h>
5 __FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.26 2004/10/17 06:51:50 tjr Exp $");
6
7+#include "xlocale_private.h"
8+
9 #include <ctype.h>
10 #include <runetype.h>
11 #include <wchar.h>
12 #include "mblocal.h"
13
14+/* _DefaultRuneLocale is depreciated; _DefaultRuneXLocale is used instead */
15 _RuneLocale _DefaultRuneLocale = {
16 _RUNE_MAGIC_1,
17 "NONE",
18@@ -249,15 +252,222 @@
19 },
20 };
21
22-_RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale;
23+__private_extern__ struct __xlocale_st_runelocale _DefaultRuneXLocale = {
24+ 0,
25+ XPERMANENT,
26+ "C",
27+ 1,
28+ _none_mbrtowc,
29+ _none_mbsinit,
30+ _none_mbsnrtowcs,
31+ _none_wcrtomb,
32+ _none_wcsnrtombs,
33+ sizeof(struct __xlocale_st_runelocale),
34+ {
35+ _RUNE_MAGIC_1,
36+ "NONE",
37+ NULL,
38+ NULL,
39+ 0xFFFD,
40+
41+ { /*00*/ _CTYPE_C,
42+ _CTYPE_C,
43+ _CTYPE_C,
44+ _CTYPE_C,
45+ _CTYPE_C,
46+ _CTYPE_C,
47+ _CTYPE_C,
48+ _CTYPE_C,
49+ /*08*/ _CTYPE_C,
50+ _CTYPE_C|_CTYPE_S|_CTYPE_B,
51+ _CTYPE_C|_CTYPE_S,
52+ _CTYPE_C|_CTYPE_S,
53+ _CTYPE_C|_CTYPE_S,
54+ _CTYPE_C|_CTYPE_S,
55+ _CTYPE_C,
56+ _CTYPE_C,
57+ /*10*/ _CTYPE_C,
58+ _CTYPE_C,
59+ _CTYPE_C,
60+ _CTYPE_C,
61+ _CTYPE_C,
62+ _CTYPE_C,
63+ _CTYPE_C,
64+ _CTYPE_C,
65+ /*18*/ _CTYPE_C,
66+ _CTYPE_C,
67+ _CTYPE_C,
68+ _CTYPE_C,
69+ _CTYPE_C,
70+ _CTYPE_C,
71+ _CTYPE_C,
72+ _CTYPE_C,
73+ /*20*/ _CTYPE_S|_CTYPE_B|_CTYPE_R,
74+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
75+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
76+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
77+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
78+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
79+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
80+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
81+ /*28*/ _CTYPE_P|_CTYPE_R|_CTYPE_G,
82+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
83+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
84+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
85+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
86+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
87+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
88+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
89+ /*30*/ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
90+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
91+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
92+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
93+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
94+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
95+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
96+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
97+ /*38*/ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
98+ _CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
99+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
100+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
101+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
102+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
103+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
104+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
105+ /*40*/ _CTYPE_P|_CTYPE_R|_CTYPE_G,
106+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
107+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
108+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
109+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
110+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
111+ _CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
112+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
113+ /*48*/ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
114+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
115+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
116+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
117+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
118+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
119+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
120+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
121+ /*50*/ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
122+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
123+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
124+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
125+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
126+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
127+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
128+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
129+ /*58*/ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
130+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
131+ _CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
132+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
133+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
134+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
135+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
136+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
137+ /*60*/ _CTYPE_P|_CTYPE_R|_CTYPE_G,
138+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
139+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
140+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
141+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
142+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
143+ _CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
144+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
145+ /*68*/ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
146+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
147+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
148+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
149+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
150+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
151+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
152+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
153+ /*70*/ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
154+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
155+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
156+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
157+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
158+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
159+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
160+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
161+ /*78*/ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
162+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
163+ _CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
164+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
165+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
166+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
167+ _CTYPE_P|_CTYPE_R|_CTYPE_G,
168+ _CTYPE_C,
169+ },
170+ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
171+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
172+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
173+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
174+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
175+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
176+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
177+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
178+ 0x40, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
179+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
180+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
181+ 'x', 'y', 'z', 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
182+ 0x60, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
183+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
184+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
185+ 'x', 'y', 'z', 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
186+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
187+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
188+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
189+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
190+ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
191+ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
192+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
193+ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
194+ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
195+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
196+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
197+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
198+ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
199+ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
200+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
201+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
202+ },
203+ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
204+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
205+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
206+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
207+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
208+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
209+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
210+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
211+ 0x40, 'A', 'B', 'C', 'D', 'E', 'F', 'G',
212+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
213+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
214+ 'X', 'Y', 'Z', 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
215+ 0x60, 'A', 'B', 'C', 'D', 'E', 'F', 'G',
216+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
217+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
218+ 'X', 'Y', 'Z', 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
219+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
220+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
221+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
222+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
223+ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
224+ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
225+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
226+ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
227+ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
228+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
229+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
230+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
231+ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
232+ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
233+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
234+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
235+ },
236+ },
237+};
238+
239+_RuneLocale *_CurrentRuneLocale = &_DefaultRuneXLocale._CurrentRuneLocale;
240
241 int __mb_cur_max = 1;
242-size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
243- mbstate_t * __restrict) = _none_mbrtowc;
244-int (*__mbsinit)(const mbstate_t *) = _none_mbsinit;
245-size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
246- size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs;
247-size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) =
248- _none_wcrtomb;
249-size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
250- size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs;
mirror of libc