author | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:38:18 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:38:18 (UTC) |
commit | 55ac326ecb01161bf62865ae3350acf85db97d63 (patch) (unidiff) | |
tree | e37bcd8fef5523aa627ec9fdcd3401105f8e579d | |
parent | d04c4734bcf40b1d17c55b18fba2aa8344678e8f (diff) | |
parent | a2ebbd6948da96172108db5e9c02c141923ad05c (diff) | |
download | cgit-55ac326ecb01161bf62865ae3350acf85db97d63.zip cgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar.gz cgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar.bz2 |
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.
-rw-r--r-- | cgit.h | 7 | ||||
-rw-r--r-- | parsing.c | 25 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 2 |
4 files changed, 35 insertions, 1 deletions
@@ -18,2 +18,3 @@ | |||
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | ||
19 | 20 | ||
@@ -50,2 +51,7 @@ | |||
50 | 51 | ||
52 | /* | ||
53 | * Default encoding | ||
54 | */ | ||
55 | #define PAGE_ENCODING "UTF-8" | ||
56 | |||
51 | typedef void (*configfn)(const char *name, const char *value); | 57 | typedef void (*configfn)(const char *name, const char *value); |
@@ -92,2 +98,3 @@ struct commitinfo { | |||
92 | char *msg; | 98 | char *msg; |
99 | char *msg_encoding; | ||
93 | }; | 100 | }; |
@@ -201,2 +201,3 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | ret->msg_encoding = NULL; | ||
202 | 203 | ||
@@ -235,2 +236,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
235 | 236 | ||
237 | if (!strncmp(p, "encoding ", 9)) { | ||
238 | p += 9; | ||
239 | t = strchr(p, '\n') + 1; | ||
240 | ret->msg_encoding = substr(p, t); | ||
241 | p = t; | ||
242 | } else | ||
243 | ret->msg_encoding = xstrdup(PAGE_ENCODING); | ||
244 | |||
236 | while (*p && (*p != '\n')) | 245 | while (*p && (*p != '\n')) |
@@ -255,2 +264,18 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
255 | 264 | ||
265 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { | ||
266 | t = reencode_string(ret->subject, PAGE_ENCODING, | ||
267 | ret->msg_encoding); | ||
268 | if(t) { | ||
269 | free(ret->subject); | ||
270 | ret->subject = t; | ||
271 | } | ||
272 | |||
273 | t = reencode_string(ret->msg, PAGE_ENCODING, | ||
274 | ret->msg_encoding); | ||
275 | if(t) { | ||
276 | free(ret->msg); | ||
277 | ret->msg = t; | ||
278 | } | ||
279 | } | ||
280 | |||
256 | return ret; | 281 | return ret; |
@@ -267,2 +267,4 @@ void *cgit_free_commitinfo(struct commitinfo *info) | |||
267 | free(info->subject); | 267 | free(info->subject); |
268 | free(info->msg); | ||
269 | free(info->msg_encoding); | ||
268 | free(info); | 270 | free(info); |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -354,3 +354,3 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
354 | { | 354 | { |
355 | html("Content-Type: text/html; charset=utf-8\n"); | 355 | html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); |
356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |