-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | parsing.c | 64 |
2 files changed, 5 insertions, 60 deletions
@@ -11,16 +11,17 @@ #include <tag.h> #include <diff.h> #include <diffcore.h> #include <refs.h> #include <revision.h> #include <log-tree.h> #include <archive.h> #include <xdiff/xdiff.h> +#include <utf8.h> /* * The valid cgit repo-commands */ #define CMD_LOG 1 #define CMD_COMMIT 2 #define CMD_DIFF 3 @@ -1,18 +1,16 @@ /* config.c: parsing of config files * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -#include <iconv.h> - #include "cgit.h" int next_char(FILE *f) { int c = fgetc(f); if (c=='\r') { c = fgetc(f); if (c!='\n') { @@ -173,72 +171,16 @@ void cgit_parse_url(const char *url) cgit_query_path = trim_end(p + 1, '/'); } cgit_cmd = cgit_get_cmd_index(cmd + 1); cgit_query_page = xstrdup(cmd + 1); return; } } -static char *iconv_msg(char *msg, const char *encoding) -{ - iconv_t msg_conv = iconv_open(PAGE_ENCODING, encoding); - size_t inlen = strlen(msg); - char *in; - char *out; - size_t inleft; - size_t outleft; - char *buf; - char *ret; - size_t buf_sz; - int again, fail; - - if(msg_conv == (iconv_t)-1) - return NULL; - - buf_sz = inlen * 2; - buf = xmalloc(buf_sz+1); - do { - in = msg; - inleft = inlen; - - out = buf; - outleft = buf_sz; - iconv(msg_conv, &in, &inleft, &out, &outleft); - - if(inleft == 0) { - fail = 0; - again = 0; - } else if(inleft != 0 && errno == E2BIG) { - fail = 0; - again = 1; - - buf_sz *= 2; - free(buf); - buf = xmalloc(buf_sz+1); - } else { - fail = 1; - again = 0; - } - } while(again && !fail); - - if(fail) { - free(buf); - ret = NULL; - } else { - buf = xrealloc(buf, out - buf); - *out = 0; - ret = buf; - } - - iconv_close(msg_conv); - - return ret; -} - char *substr(const char *head, const char *tail) { char *buf; buf = xmalloc(tail - head + 1); strncpy(buf, head, tail - head); buf[tail - head] = '\0'; return buf; @@ -316,23 +258,25 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) while (*p == '\n') p = strchr(p, '\n') + 1; ret->msg = xstrdup(p); } else ret->subject = substr(p, p+strlen(p)); if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { - t = iconv_msg(ret->subject, ret->msg_encoding); + t = reencode_string(ret->subject, PAGE_ENCODING, + ret->msg_encoding); if(t) { free(ret->subject); ret->subject = t; } - t = iconv_msg(ret->msg, ret->msg_encoding); + t = reencode_string(ret->msg, PAGE_ENCODING, + ret->msg_encoding); if(t) { free(ret->msg); ret->msg = t; } } return ret; } |