| author | Julius Plenz <plenz@cis.fu-berlin.de> | 2011-03-10 16:03:23 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-26 14:21:07 (UTC) |
| commit | 0a799424f682071da9f5b632d1394308e9255bb5 (patch) (side-by-side diff) | |
| tree | cbc64c3d05d27cffb6c997b7ace6924838a829ff | |
| parent | 5db02854e64fa41aa459ea7d13fc827063deda41 (diff) | |
| download | cgit-0a799424f682071da9f5b632d1394308e9255bb5.zip cgit-0a799424f682071da9f5b632d1394308e9255bb5.tar.gz cgit-0a799424f682071da9f5b632d1394308e9255bb5.tar.bz2 | |
fix two encoding bugs
reencode() takes three arguments in the order (txt, from, to), opposed to
reencode_string, which will, like iconv, handle the arguments with from
and to swapped. Fix that (this makes reencode more intuitive).
If src and dst encoding are equivalent, don't do any encoding.
If no special encoding parameter is found within the commit, assume
UTF-8 and explicitly convert to PAGE_ENCODING. The change to reencode()
mentioned above avoids re-encoding a UTF-8 string to UTF-8, for example.
Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | parsing.c | 24 |
1 files changed, 15 insertions, 9 deletions
@@ -108,3 +108,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) - tmp = reencode_string(*txt, src_enc, dst_enc); + /* no encoding needed if src_enc equals dst_enc */ + if(!strcasecmp(src_enc, dst_enc)) + return *txt; + + tmp = reencode_string(*txt, dst_enc, src_enc); if (tmp) { @@ -162,2 +166,6 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) + /* if no special encoding is found, assume UTF-8 */ + if(!ret->msg_encoding) + ret->msg_encoding = xstrdup("UTF-8"); + // skip unknown header fields @@ -191,10 +199,8 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) - if (ret->msg_encoding) { - reencode(&ret->author, PAGE_ENCODING, ret->msg_encoding); - reencode(&ret->author_email, PAGE_ENCODING, ret->msg_encoding); - reencode(&ret->committer, PAGE_ENCODING, ret->msg_encoding); - reencode(&ret->committer_email, PAGE_ENCODING, ret->msg_encoding); - reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding); - reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding); - } + reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING); + reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING); + reencode(&ret->committer, ret->msg_encoding, PAGE_ENCODING); + reencode(&ret->committer_email, ret->msg_encoding, PAGE_ENCODING); + reencode(&ret->subject, ret->msg_encoding, PAGE_ENCODING); + reencode(&ret->msg, ret->msg_encoding, PAGE_ENCODING); |