X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/16a3d2779ccd56bf7954d98da547247d8796544b..7858a309d7671109950ec940f893c2d112d36b99:/parsing.c?ds=sidebyside

diff --git a/parsing.c b/parsing.c
index 2c05c09..c731084 100644
--- a/parsing.c
+++ b/parsing.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#include <iconv.h>
+
 #include "cgit.h"
 
 int next_char(FILE *f)
@@ -176,6 +178,62 @@ void cgit_parse_url(const char *url)
 	}
 }
 
+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;
@@ -199,6 +257,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 	ret->committer_email = NULL;
 	ret->subject = NULL;
 	ret->msg = NULL;
+	ret->msg_encoding = NULL;
 
 	if (p == NULL)
 		return ret;
@@ -233,23 +292,48 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 		p = strchr(t, '\n') + 1;
 	}
 
+	if (!strncmp(p, "encoding ", 9)) {
+		p += 9;
+		t = strchr(p, '\n') + 1;
+		ret->msg_encoding = substr(p, t);
+		p = t;
+	} else
+		ret->msg_encoding = xstrdup(PAGE_ENCODING);
+
+	while (*p && (*p != '\n'))
+		p = strchr(p, '\n') + 1; // skip unknown header fields
+
 	while (*p == '\n')
 		p = strchr(p, '\n') + 1;
 
 	t = strchr(p, '\n');
 	if (t) {
 		if (*t == '\0')
-			ret->subject = strdup("** empty **");
+			ret->subject = "** empty **";
 		else
 			ret->subject = substr(p, t);
 		p = t + 1;
 
 		while (*p == '\n')
 			p = strchr(p, '\n') + 1;
-		ret->msg = p;
+		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);
+		if(t) {
+			free(ret->subject);
+			ret->subject = t;
+		}
+
+		t = iconv_msg(ret->msg, ret->msg_encoding);
+		if(t) {
+			free(ret->msg);
+			ret->msg = t;
+		}
+	}
+
 	return ret;
 }
 
@@ -292,6 +376,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 		p = strchr(p, '\n') + 1;
 	}
 
+	while (p && *p && (*p != '\n'))
+		p = strchr(p, '\n') + 1; // skip unknown tag fields
+
 	while (p && (*p == '\n'))
 		p = strchr(p, '\n') + 1;
 	if (p && *p)