author | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 21:27:43 (UTC) |
---|---|---|
committer | Jonathan Bastien-Filiatrault <joe@x2a.org> | 2007-11-05 23:13:31 (UTC) |
commit | a2ebbd6948da96172108db5e9c02c141923ad05c (patch) (unidiff) | |
tree | 9c40233ffcd35f1b20bb07a04bdb8c23d649e1ee /parsing.c | |
parent | 7858a309d7671109950ec940f893c2d112d36b99 (diff) | |
download | cgit-a2ebbd6948da96172108db5e9c02c141923ad05c.zip cgit-a2ebbd6948da96172108db5e9c02c141923ad05c.tar.gz cgit-a2ebbd6948da96172108db5e9c02c141923ad05c.tar.bz2 |
Use utf8::reencode_string from git
This replaces the iconv-support in cgit with similar functions already
existing in git.
Signed-off-by: Lars Hjemli <hjemli@gmai.com>
-rw-r--r-- | parsing.c | 64 |
1 files changed, 4 insertions, 60 deletions
@@ -1,22 +1,20 @@ | |||
1 | /* config.c: parsing of config files | 1 | /* config.c: parsing of config files |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <iconv.h> | ||
10 | |||
11 | #include "cgit.h" | 9 | #include "cgit.h" |
12 | 10 | ||
13 | int next_char(FILE *f) | 11 | int next_char(FILE *f) |
14 | { | 12 | { |
15 | int c = fgetc(f); | 13 | int c = fgetc(f); |
16 | if (c=='\r') { | 14 | if (c=='\r') { |
17 | c = fgetc(f); | 15 | c = fgetc(f); |
18 | if (c!='\n') { | 16 | if (c!='\n') { |
19 | ungetc(c, f); | 17 | ungetc(c, f); |
20 | c = '\r'; | 18 | c = '\r'; |
21 | } | 19 | } |
22 | } | 20 | } |
@@ -169,80 +167,24 @@ void cgit_parse_url(const char *url) | |||
169 | p = strchr(cmd + 1, '/'); | 167 | p = strchr(cmd + 1, '/'); |
170 | if (p) { | 168 | if (p) { |
171 | p[0] = '\0'; | 169 | p[0] = '\0'; |
172 | if (p[1]) | 170 | if (p[1]) |
173 | cgit_query_path = trim_end(p + 1, '/'); | 171 | cgit_query_path = trim_end(p + 1, '/'); |
174 | } | 172 | } |
175 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | 173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
176 | cgit_query_page = xstrdup(cmd + 1); | 174 | cgit_query_page = xstrdup(cmd + 1); |
177 | return; | 175 | return; |
178 | } | 176 | } |
179 | } | 177 | } |
180 | 178 | ||
181 | static char *iconv_msg(char *msg, const char *encoding) | ||
182 | { | ||
183 | iconv_t msg_conv = iconv_open(PAGE_ENCODING, encoding); | ||
184 | size_t inlen = strlen(msg); | ||
185 | char *in; | ||
186 | char *out; | ||
187 | size_t inleft; | ||
188 | size_t outleft; | ||
189 | char *buf; | ||
190 | char *ret; | ||
191 | size_t buf_sz; | ||
192 | int again, fail; | ||
193 | |||
194 | if(msg_conv == (iconv_t)-1) | ||
195 | return NULL; | ||
196 | |||
197 | buf_sz = inlen * 2; | ||
198 | buf = xmalloc(buf_sz+1); | ||
199 | do { | ||
200 | in = msg; | ||
201 | inleft = inlen; | ||
202 | |||
203 | out = buf; | ||
204 | outleft = buf_sz; | ||
205 | iconv(msg_conv, &in, &inleft, &out, &outleft); | ||
206 | |||
207 | if(inleft == 0) { | ||
208 | fail = 0; | ||
209 | again = 0; | ||
210 | } else if(inleft != 0 && errno == E2BIG) { | ||
211 | fail = 0; | ||
212 | again = 1; | ||
213 | |||
214 | buf_sz *= 2; | ||
215 | free(buf); | ||
216 | buf = xmalloc(buf_sz+1); | ||
217 | } else { | ||
218 | fail = 1; | ||
219 | again = 0; | ||
220 | } | ||
221 | } while(again && !fail); | ||
222 | |||
223 | if(fail) { | ||
224 | free(buf); | ||
225 | ret = NULL; | ||
226 | } else { | ||
227 | buf = xrealloc(buf, out - buf); | ||
228 | *out = 0; | ||
229 | ret = buf; | ||
230 | } | ||
231 | |||
232 | iconv_close(msg_conv); | ||
233 | |||
234 | return ret; | ||
235 | } | ||
236 | |||
237 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
238 | { | 180 | { |
239 | char *buf; | 181 | char *buf; |
240 | 182 | ||
241 | buf = xmalloc(tail - head + 1); | 183 | buf = xmalloc(tail - head + 1); |
242 | strncpy(buf, head, tail - head); | 184 | strncpy(buf, head, tail - head); |
243 | buf[tail - head] = '\0'; | 185 | buf[tail - head] = '\0'; |
244 | return buf; | 186 | return buf; |
245 | } | 187 | } |
246 | 188 | ||
247 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
248 | { | 190 | { |
@@ -312,31 +254,33 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
312 | ret->subject = "** empty **"; | 254 | ret->subject = "** empty **"; |
313 | else | 255 | else |
314 | ret->subject = substr(p, t); | 256 | ret->subject = substr(p, t); |
315 | p = t + 1; | 257 | p = t + 1; |
316 | 258 | ||
317 | while (*p == '\n') | 259 | while (*p == '\n') |
318 | p = strchr(p, '\n') + 1; | 260 | p = strchr(p, '\n') + 1; |
319 | ret->msg = xstrdup(p); | 261 | ret->msg = xstrdup(p); |
320 | } else | 262 | } else |
321 | ret->subject = substr(p, p+strlen(p)); | 263 | ret->subject = substr(p, p+strlen(p)); |
322 | 264 | ||
323 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { | 265 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { |
324 | t = iconv_msg(ret->subject, ret->msg_encoding); | 266 | t = reencode_string(ret->subject, PAGE_ENCODING, |
267 | ret->msg_encoding); | ||
325 | if(t) { | 268 | if(t) { |
326 | free(ret->subject); | 269 | free(ret->subject); |
327 | ret->subject = t; | 270 | ret->subject = t; |
328 | } | 271 | } |
329 | 272 | ||
330 | t = iconv_msg(ret->msg, ret->msg_encoding); | 273 | t = reencode_string(ret->msg, PAGE_ENCODING, |
274 | ret->msg_encoding); | ||
331 | if(t) { | 275 | if(t) { |
332 | free(ret->msg); | 276 | free(ret->msg); |
333 | ret->msg = t; | 277 | ret->msg = t; |
334 | } | 278 | } |
335 | } | 279 | } |
336 | 280 | ||
337 | return ret; | 281 | return ret; |
338 | } | 282 | } |
339 | 283 | ||
340 | 284 | ||
341 | struct taginfo *cgit_parse_tag(struct tag *tag) | 285 | struct taginfo *cgit_parse_tag(struct tag *tag) |
342 | { | 286 | { |