summaryrefslogtreecommitdiffabout
path: root/parsing.c
authorJonathan Bastien-Filiatrault <joe@x2a.org>2007-10-26 22:11:26 (UTC)
committer Jonathan Bastien-Filiatrault <joe@x2a.org>2007-11-05 23:13:30 (UTC)
commitaf0819830445e39584a0137034562086a55deaf2 (patch) (unidiff)
treea9da08806d706be633b63d0fc2f9dbe12824536b /parsing.c
parentaa5cc328f4894ba6972842b4edbca3017f169050 (diff)
downloadcgit-af0819830445e39584a0137034562086a55deaf2.zip
cgit-af0819830445e39584a0137034562086a55deaf2.tar.gz
cgit-af0819830445e39584a0137034562086a55deaf2.tar.bz2
Add iconv_msg function.
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c58
1 files changed, 58 insertions, 0 deletions
diff --git a/parsing.c b/parsing.c
index 16b4db7..f156c12 100644
--- a/parsing.c
+++ b/parsing.c
@@ -3,12 +3,14 @@
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
9#include "cgit.h" 11#include "cgit.h"
10 12
11int next_char(FILE *f) 13int next_char(FILE *f)
12{ 14{
13 int c = fgetc(f); 15 int c = fgetc(f);
14 if (c=='\r') { 16 if (c=='\r') {
@@ -173,12 +175,68 @@ void cgit_parse_url(const char *url)
173 cgit_cmd = cgit_get_cmd_index(cmd + 1); 175 cgit_cmd = cgit_get_cmd_index(cmd + 1);
174 cgit_query_page = xstrdup(cmd + 1); 176 cgit_query_page = xstrdup(cmd + 1);
175 return; 177 return;
176 } 178 }
177} 179}
178 180
181static 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
179char *substr(const char *head, const char *tail) 237char *substr(const char *head, const char *tail)
180{ 238{
181 char *buf; 239 char *buf;
182 240
183 buf = xmalloc(tail - head + 1); 241 buf = xmalloc(tail - head + 1);
184 strncpy(buf, head, tail - head); 242 strncpy(buf, head, tail - head);