1 --- a/extra/locale/gen_wctype.c
2 +++ b/extra/locale/gen_wctype.c
3 @@ -227,11 +227,12 @@ int main(int argc, char **argv)
7 - if (!setlocale(LC_CTYPE, *argv)) {
8 + /* setlocale might be just a stub */
9 + /* if (!setlocale(LC_CTYPE, *argv)) {
10 verbose_msg("setlocale(LC_CTYPE,%s) failed! Skipping this locale...\n", *argv);
15 if (!(totitle = wctrans("totitle"))) {
16 verbose_msg("no totitle transformation.\n");
18 @@ -306,43 +307,43 @@ int main(int argc, char **argv)
23 + unsigned int curr_stdclib;
26 - if (isalnum(c)) ++glibc; glibc <<= 1;
27 - if (isalpha(c)) ++glibc; glibc <<= 1;
28 - if (isblank(c)) ++glibc; glibc <<= 1;
29 - if (iscntrl(c)) ++glibc; glibc <<= 1;
30 - if (isdigit(c)) ++glibc; glibc <<= 1;
31 - if (isgraph(c)) ++glibc; glibc <<= 1;
32 - if (islower(c)) ++glibc; glibc <<= 1;
33 - if (isprint(c)) ++glibc; glibc <<= 1;
34 - if (ispunct(c)) ++glibc; glibc <<= 1;
35 - if (isspace(c)) ++glibc; glibc <<= 1;
36 - if (isupper(c)) ++glibc; glibc <<= 1;
37 - if (isxdigit(c)) ++glibc;
38 - verbose_msg("%#8x : ctype %#4x\n", c, glibc);
40 + if (isalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
41 + if (isalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
42 + if (isblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
43 + if (iscntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
44 + if (isdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
45 + if (isgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
46 + if (islower(c)) ++curr_stdclib; curr_stdclib <<= 1;
47 + if (isprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
48 + if (ispunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
49 + if (isspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
50 + if (isupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
51 + if (isxdigit(c)) ++curr_stdclib;
52 + verbose_msg("%#8x : ctype %#4x\n", c, curr_stdclib);
56 /* Paranoid checking... */
59 + unsigned int curr_stdclib;
63 - if (iswalnum(c)) ++glibc; glibc <<= 1;
64 - if (iswalpha(c)) ++glibc; glibc <<= 1;
65 - if (iswblank(c)) ++glibc; glibc <<= 1;
66 - if (iswcntrl(c)) ++glibc; glibc <<= 1;
67 - if (iswdigit(c)) ++glibc; glibc <<= 1;
68 - if (iswgraph(c)) ++glibc; glibc <<= 1;
69 - if (iswlower(c)) ++glibc; glibc <<= 1;
70 - if (iswprint(c)) ++glibc; glibc <<= 1;
71 - if (iswpunct(c)) ++glibc; glibc <<= 1;
72 - if (iswspace(c)) ++glibc; glibc <<= 1;
73 - if (iswupper(c)) ++glibc; glibc <<= 1;
74 - if (iswxdigit(c)) ++glibc;
76 + if (iswalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
77 + if (iswalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
78 + if (iswblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
79 + if (iswcntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
80 + if (iswdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
81 + if (iswgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
82 + if (iswlower(c)) ++curr_stdclib; curr_stdclib <<= 1;
83 + if (iswprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
84 + if (iswpunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
85 + if (iswspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
86 + if (iswupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
87 + if (iswxdigit(c)) ++curr_stdclib;
90 if (mywalnum(d,c)) ++mine; mine <<= 1;
91 @@ -358,15 +359,15 @@ int main(int argc, char **argv)
92 if (mywupper(d,c)) ++mine; mine <<= 1;
93 if (mywxdigit(d,c)) ++mine;
95 - if (glibc != mine) {
96 - verbose_msg("%#8x : glibc %#4x != %#4x mine %u\n", c, glibc, mine, d);
97 + if (curr_stdclib != mine) {
98 + verbose_msg("%#8x : curr_stdclib %#4x != %#4x mine %u\n", c, curr_stdclib, mine, d);
102 if (iswctype(c,is_comb) || iswctype(c,is_comb3)) {
103 /* if (!iswpunct(c)) { */
104 verbose_msg("%#8x : %d %d %#4x\n",
105 - c, iswctype(c,is_comb),iswctype(c,is_comb3), glibc);
106 + c, iswctype(c,is_comb),iswctype(c,is_comb3), curr_stdclib);
110 @@ -553,7 +554,7 @@ int main(int argc, char **argv)
111 for (c = 0; c <= 0x10ffffUL; c++)
114 - unsigned int glibc;
115 + unsigned int curr_stdclib;
117 unsigned int upper, lower;
119 @@ -568,19 +569,19 @@ int main(int argc, char **argv)
124 - if (iswalnum(c)) ++glibc; glibc <<= 1;
125 - if (iswalpha(c)) ++glibc; glibc <<= 1;
126 - if (iswblank(c)) ++glibc; glibc <<= 1;
127 - if (iswcntrl(c)) ++glibc; glibc <<= 1;
128 - if (iswdigit(c)) ++glibc; glibc <<= 1;
129 - if (iswgraph(c)) ++glibc; glibc <<= 1;
130 - if (iswlower(c)) ++glibc; glibc <<= 1;
131 - if (iswprint(c)) ++glibc; glibc <<= 1;
132 - if (iswpunct(c)) ++glibc; glibc <<= 1;
133 - if (iswspace(c)) ++glibc; glibc <<= 1;
134 - if (iswupper(c)) ++glibc; glibc <<= 1;
135 - if (iswxdigit(c)) ++glibc;
137 + if (iswalnum(c)) ++curr_stdclib; curr_stdclib <<= 1;
138 + if (iswalpha(c)) ++curr_stdclib; curr_stdclib <<= 1;
139 + if (iswblank(c)) ++curr_stdclib; curr_stdclib <<= 1;
140 + if (iswcntrl(c)) ++curr_stdclib; curr_stdclib <<= 1;
141 + if (iswdigit(c)) ++curr_stdclib; curr_stdclib <<= 1;
142 + if (iswgraph(c)) ++curr_stdclib; curr_stdclib <<= 1;
143 + if (iswlower(c)) ++curr_stdclib; curr_stdclib <<= 1;
144 + if (iswprint(c)) ++curr_stdclib; curr_stdclib <<= 1;
145 + if (iswpunct(c)) ++curr_stdclib; curr_stdclib <<= 1;
146 + if (iswspace(c)) ++curr_stdclib; curr_stdclib <<= 1;
147 + if (iswupper(c)) ++curr_stdclib; curr_stdclib <<= 1;
148 + if (iswxdigit(c)) ++curr_stdclib;
152 @@ -630,8 +631,8 @@ int main(int argc, char **argv)
153 if (mywupper(d,c)) ++mine; mine <<= 1;
154 if (mywxdigit(d,c)) ++mine;
156 - if (glibc != mine) {
157 - verbose_msg("%#8x : glibc %#4x != %#4x mine %d\n", c, glibc, mine, d);
158 + if (curr_stdclib != mine) {
159 + verbose_msg("%#8x : curr_stdclib %#4x != %#4x mine %d\n", c, curr_stdclib, mine, d);
161 verbose_msg("sc=%#x u=%#x n=%#x i0=%#x i1=%#x\n", sc, u, n, i0, i1);
163 @@ -655,17 +656,17 @@ int main(int argc, char **argv)
166 if (towupper(c) != upper) {
167 - verbose_msg("%#8x : towupper glibc %#4x != %#4x mine\n",
168 + verbose_msg("%#8x : towupper curr_stdclib %#4x != %#4x mine\n",
169 c, towupper(c), upper);
172 if (towlower(c) != lower) {
173 - verbose_msg("%#8x : towlower glibc %#4x != %#4x mine i0 = %d\n",
174 + verbose_msg("%#8x : towlower curr_stdclib %#4x != %#4x mine i0 = %d\n",
175 c, towlower(c), lower, i0);
178 if (totitle && ((tt = towctrans(c, totitle)) != upper)) {
179 - verbose_msg("%#8x : totitle glibc %#4lx != %#4x mine i0 = %d\n",
180 + verbose_msg("%#8x : totitle curr_stdclib %#4lx != %#4x mine i0 = %d\n",