Deleted Added
sdiff udiff text old ( 101566 ) new ( 130961 )
full compact
rune.c (101566) rune.c (130961)
1/*-
2 * Copyright (c) 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Paul Borman at Krystal Technologies.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 24 unchanged lines hidden (view full) ---

33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93";
39#endif /* LIBC_SCCS and not lint */
40#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Paul Borman at Krystal Technologies.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 24 unchanged lines hidden (view full) ---

33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93";
39#endif /* LIBC_SCCS and not lint */
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/lib/libc/locale/rune.c 101566 2002-08-09 08:22:29Z ache $");
41__FBSDID("$FreeBSD: head/lib/libc/locale/rune.c 130961 2004-06-23 07:01:44Z tjr $");
42
43#include "namespace.h"
44#include <arpa/inet.h>
45#include <errno.h>
46#include <rune.h>
47#include <stdio.h>
48#include <string.h>
49#include <stdlib.h>

--- 37 unchanged lines hidden (view full) ---

87 free(data);
88 errno = saverr;
89 return (NULL);
90 }
91
92 rl = (_RuneLocale *)data;
93 lastp = data + sb.st_size;
94
42
43#include "namespace.h"
44#include <arpa/inet.h>
45#include <errno.h>
46#include <rune.h>
47#include <stdio.h>
48#include <string.h>
49#include <stdlib.h>

--- 37 unchanged lines hidden (view full) ---

87 free(data);
88 errno = saverr;
89 return (NULL);
90 }
91
92 rl = (_RuneLocale *)data;
93 lastp = data + sb.st_size;
94
95 rl->variable = rl + 1;
95 rl->__variable = rl + 1;
96
96
97 if (memcmp(rl->magic, _RUNE_MAGIC_1, sizeof(rl->magic))) {
97 if (memcmp(rl->__magic, _RUNE_MAGIC_1, sizeof(rl->__magic))) {
98 free(data);
99 errno = EFTYPE;
100 return (NULL);
101 }
102
98 free(data);
99 errno = EFTYPE;
100 return (NULL);
101 }
102
103 rl->invalid_rune = ntohl(rl->invalid_rune);
104 rl->variable_len = ntohl(rl->variable_len);
105 rl->runetype_ext.nranges = ntohl(rl->runetype_ext.nranges);
106 rl->maplower_ext.nranges = ntohl(rl->maplower_ext.nranges);
107 rl->mapupper_ext.nranges = ntohl(rl->mapupper_ext.nranges);
103 rl->__invalid_rune = ntohl(rl->__invalid_rune);
104 rl->__variable_len = ntohl(rl->__variable_len);
105 rl->__runetype_ext.__nranges = ntohl(rl->__runetype_ext.__nranges);
106 rl->__maplower_ext.__nranges = ntohl(rl->__maplower_ext.__nranges);
107 rl->__mapupper_ext.__nranges = ntohl(rl->__mapupper_ext.__nranges);
108
109 for (x = 0; x < _CACHED_RUNES; ++x) {
108
109 for (x = 0; x < _CACHED_RUNES; ++x) {
110 rl->runetype[x] = ntohl(rl->runetype[x]);
111 rl->maplower[x] = ntohl(rl->maplower[x]);
112 rl->mapupper[x] = ntohl(rl->mapupper[x]);
110 rl->__runetype[x] = ntohl(rl->__runetype[x]);
111 rl->__maplower[x] = ntohl(rl->__maplower[x]);
112 rl->__mapupper[x] = ntohl(rl->__mapupper[x]);
113 }
114
113 }
114
115 rl->runetype_ext.ranges = (_RuneEntry *)rl->variable;
116 rl->variable = rl->runetype_ext.ranges + rl->runetype_ext.nranges;
117 if (rl->variable > lastp) {
115 rl->__runetype_ext.__ranges = (_RuneEntry *)rl->__variable;
116 rl->__variable = rl->__runetype_ext.__ranges +
117 rl->__runetype_ext.__nranges;
118 if (rl->__variable > lastp) {
118 free(data);
119 errno = EFTYPE;
120 return (NULL);
121 }
122
119 free(data);
120 errno = EFTYPE;
121 return (NULL);
122 }
123
123 rl->maplower_ext.ranges = (_RuneEntry *)rl->variable;
124 rl->variable = rl->maplower_ext.ranges + rl->maplower_ext.nranges;
125 if (rl->variable > lastp) {
124 rl->__maplower_ext.__ranges = (_RuneEntry *)rl->__variable;
125 rl->__variable = rl->__maplower_ext.__ranges +
126 rl->__maplower_ext.__nranges;
127 if (rl->__variable > lastp) {
126 free(data);
127 errno = EFTYPE;
128 return (NULL);
129 }
130
128 free(data);
129 errno = EFTYPE;
130 return (NULL);
131 }
132
131 rl->mapupper_ext.ranges = (_RuneEntry *)rl->variable;
132 rl->variable = rl->mapupper_ext.ranges + rl->mapupper_ext.nranges;
133 if (rl->variable > lastp) {
133 rl->__mapupper_ext.__ranges = (_RuneEntry *)rl->__variable;
134 rl->__variable = rl->__mapupper_ext.__ranges +
135 rl->__mapupper_ext.__nranges;
136 if (rl->__variable > lastp) {
134 free(data);
135 errno = EFTYPE;
136 return (NULL);
137 }
138
137 free(data);
138 errno = EFTYPE;
139 return (NULL);
140 }
141
139 for (x = 0; x < rl->runetype_ext.nranges; ++x) {
140 rr = rl->runetype_ext.ranges;
142 for (x = 0; x < rl->__runetype_ext.__nranges; ++x) {
143 rr = rl->__runetype_ext.__ranges;
141
144
142 rr[x].min = ntohl(rr[x].min);
143 rr[x].max = ntohl(rr[x].max);
144 if ((rr[x].map = ntohl(rr[x].map)) == 0) {
145 int len = rr[x].max - rr[x].min + 1;
146 rr[x].types = rl->variable;
147 rl->variable = rr[x].types + len;
148 if (rl->variable > lastp) {
145 rr[x].__min = ntohl(rr[x].__min);
146 rr[x].__max = ntohl(rr[x].__max);
147 if ((rr[x].__map = ntohl(rr[x].__map)) == 0) {
148 int len = rr[x].__max - rr[x].__min + 1;
149 rr[x].__types = rl->__variable;
150 rl->__variable = rr[x].__types + len;
151 if (rl->__variable > lastp) {
149 free(data);
150 errno = EFTYPE;
151 return (NULL);
152 }
153 while (len-- > 0)
152 free(data);
153 errno = EFTYPE;
154 return (NULL);
155 }
156 while (len-- > 0)
154 rr[x].types[len] = ntohl(rr[x].types[len]);
157 rr[x].__types[len] = ntohl(rr[x].__types[len]);
155 } else
158 } else
156 rr[x].types = 0;
159 rr[x].__types = 0;
157 }
158
160 }
161
159 for (x = 0; x < rl->maplower_ext.nranges; ++x) {
160 rr = rl->maplower_ext.ranges;
162 for (x = 0; x < rl->__maplower_ext.__nranges; ++x) {
163 rr = rl->__maplower_ext.__ranges;
161
164
162 rr[x].min = ntohl(rr[x].min);
163 rr[x].max = ntohl(rr[x].max);
164 rr[x].map = ntohl(rr[x].map);
165 rr[x].__min = ntohl(rr[x].__min);
166 rr[x].__max = ntohl(rr[x].__max);
167 rr[x].__map = ntohl(rr[x].__map);
165 }
166
168 }
169
167 for (x = 0; x < rl->mapupper_ext.nranges; ++x) {
168 rr = rl->mapupper_ext.ranges;
170 for (x = 0; x < rl->__mapupper_ext.__nranges; ++x) {
171 rr = rl->__mapupper_ext.__ranges;
169
172
170 rr[x].min = ntohl(rr[x].min);
171 rr[x].max = ntohl(rr[x].max);
172 rr[x].map = ntohl(rr[x].map);
173 rr[x].__min = ntohl(rr[x].__min);
174 rr[x].__max = ntohl(rr[x].__max);
175 rr[x].__map = ntohl(rr[x].__map);
173 }
176 }
174 if (((char *)rl->variable) + rl->variable_len > (char *)lastp) {
177 if (((char *)rl->__variable) + rl->__variable_len > (char *)lastp) {
175 free(data);
176 errno = EFTYPE;
177 return (NULL);
178 }
179
180 /*
181 * Go out and zero pointers that should be zero.
182 */
178 free(data);
179 errno = EFTYPE;
180 return (NULL);
181 }
182
183 /*
184 * Go out and zero pointers that should be zero.
185 */
183 if (!rl->variable_len)
184 rl->variable = 0;
186 if (!rl->__variable_len)
187 rl->__variable = 0;
185
188
186 if (!rl->runetype_ext.nranges)
187 rl->runetype_ext.ranges = 0;
189 if (!rl->__runetype_ext.__nranges)
190 rl->__runetype_ext.__ranges = 0;
188
191
189 if (!rl->maplower_ext.nranges)
190 rl->maplower_ext.ranges = 0;
192 if (!rl->__maplower_ext.__nranges)
193 rl->__maplower_ext.__ranges = 0;
191
194
192 if (!rl->mapupper_ext.nranges)
193 rl->mapupper_ext.ranges = 0;
195 if (!rl->__mapupper_ext.__nranges)
196 rl->__mapupper_ext.__ranges = 0;
194
195 return (rl);
196}
197
198 return (rl);
199}