X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6130231ed5e7475836a44d79d5f09e300e71a407..d1f3bbe9d22029f45a77bb938c176ccc0c827d46:/parsing.c

diff --git a/parsing.c b/parsing.c
index 74a2484..027f06b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -143,35 +143,35 @@ void cgit_parse_url(const char *url)
 {
 	char *cmd, *p;
 
-	cgit_repo = NULL;
+	ctx.repo = NULL;
 	if (!url || url[0] == '\0')
 		return;
 
-	cgit_repo = cgit_get_repoinfo(url);
-	if (cgit_repo) {
-		cgit_query_repo = cgit_repo->url;
+	ctx.repo = cgit_get_repoinfo(url);
+	if (ctx.repo) {
+		ctx.qry.repo = ctx.repo->url;
 		return;
 	}
 
 	cmd = strchr(url, '/');
-	while (!cgit_repo && cmd) {
+	while (!ctx.repo && cmd) {
 		cmd[0] = '\0';
-		cgit_repo = cgit_get_repoinfo(url);
-		if (cgit_repo == NULL) {
+		ctx.repo = cgit_get_repoinfo(url);
+		if (ctx.repo == NULL) {
 			cmd[0] = '/';
 			cmd = strchr(cmd + 1, '/');
 			continue;
 		}
 
-		cgit_query_repo = cgit_repo->url;
+		ctx.qry.repo = ctx.repo->url;
 		p = strchr(cmd + 1, '/');
 		if (p) {
 			p[0] = '\0';
 			if (p[1])
-				cgit_query_path = xstrdup(p + 1);
+				ctx.qry.path = trim_end(p + 1, '/');
 		}
 		cgit_cmd = cgit_get_cmd_index(cmd + 1);
-		cgit_query_page = xstrdup(cmd + 1);
+		ctx.qry.page = xstrdup(cmd + 1);
 		return;
 	}
 }
@@ -199,6 +199,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;
@@ -218,7 +219,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 		p = t;
 		t = strchr(t, '>') + 1;
 		ret->author_email = substr(p, t);
-		ret->author_date = atol(++t);
+		ret->author_date = atol(t+1);
 		p = strchr(t, '\n') + 1;
 	}
 
@@ -229,27 +230,54 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 		p = t;
 		t = strchr(t, '>') + 1;
 		ret->committer_email = substr(p, t);
-		ret->committer_date = atol(++t);
+		ret->committer_date = atol(t+1);
 		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 = reencode_string(ret->subject, PAGE_ENCODING,
+				    ret->msg_encoding);
+		if(t) {
+			free(ret->subject);
+			ret->subject = t;
+		}
+
+		t = reencode_string(ret->msg, PAGE_ENCODING,
+				    ret->msg_encoding);
+		if(t) {
+			free(ret->msg);
+			ret->msg = t;
+		}
+	}
+
 	return ret;
 }
 
@@ -287,11 +315,14 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 			p = t;
 			t = strchr(t, '>') + 1;
 			ret->tagger_email = substr(p, t);
-			ret->tagger_date = atol(++t);
+			ret->tagger_date = atol(t+1);
 		}
 		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)