Add iconv_msg function.

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
@@ -1,32 +1,34 @@
 /* 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') {
 			ungetc(c, f);
 			c = '\r';
 		}
 	}
 	return c;
 }
 
 void skip_line(FILE *f)
 {
 	int c;
 
 	while((c=next_char(f)) && c!='\n' && c!=EOF)
 		;
 }
 
 int read_config_line(FILE *f, char *line, const char **value, int bufsize)
@@ -155,48 +157,104 @@ void cgit_parse_url(const char *url)
 
 	cmd = strchr(url, '/');
 	while (!cgit_repo && cmd) {
 		cmd[0] = '\0';
 		cgit_repo = cgit_get_repoinfo(url);
 		if (cgit_repo == NULL) {
 			cmd[0] = '/';
 			cmd = strchr(cmd + 1, '/');
 			continue;
 		}
 
 		cgit_query_repo = cgit_repo->url;
 		p = strchr(cmd + 1, '/');
 		if (p) {
 			p[0] = '\0';
 			if (p[1])
 				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;
 }
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 	struct commitinfo *ret;
 	char *p = commit->buffer, *t = commit->buffer;
 
 	ret = xmalloc(sizeof(*ret));
 	ret->commit = commit;
 	ret->author = NULL;
 	ret->author_email = NULL;
 	ret->committer = NULL;
 	ret->committer_email = NULL;
 	ret->subject = NULL;
 	ret->msg = NULL;
 	ret->msg_encoding = NULL;