aboutsummaryrefslogtreecommitdiff
path: root/parsing.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-11-05 23:38:18 +0000
committerLars Hjemli <hjemli@gmail.com>2007-11-05 23:38:18 +0000
commit55ac326ecb01161bf62865ae3350acf85db97d63 (patch)
treee37bcd8fef5523aa627ec9fdcd3401105f8e579d /parsing.c
parentd04c4734bcf40b1d17c55b18fba2aa8344678e8f (diff)
parenta2ebbd6948da96172108db5e9c02c141923ad05c (diff)
downloadcgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar
cgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar.gz
cgit-55ac326ecb01161bf62865ae3350acf85db97d63.zip
Merge branch 'iconv-rebased' of http://x2a.org/pub/git/cgit
* 'iconv-rebased' of http://x2a.org/pub/git/cgit: Use utf8::reencode_string from git Convert subject and message with iconv_msg. Add iconv_msg function. Set msg_encoding according to the header. Add commit->msg_encoding, allocate msg dynamicly.
Diffstat (limited to 'parsing.c')
-rw-r--r--parsing.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/parsing.c b/parsing.c
index 30e7648..e8c7ab9 100644
--- a/parsing.c
+++ b/parsing.c
@@ -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;
@@ -233,6 +234,14 @@ 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
@@ -253,6 +262,22 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
} 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;
}