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
@@ -13,12 +13,13 @@ | |||
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | ||
19 | 20 | ||
20 | 21 | ||
21 | /* | 22 | /* |
22 | * The valid cgit repo-commands | 23 | * The valid cgit repo-commands |
23 | */ | 24 | */ |
24 | #define CMD_LOG 1 | 25 | #define CMD_LOG 1 |
@@ -45,12 +46,17 @@ | |||
45 | #define TM_DAY (TM_HOUR * 24) | 46 | #define TM_DAY (TM_HOUR * 24) |
46 | #define TM_WEEK (TM_DAY * 7) | 47 | #define TM_WEEK (TM_DAY * 7) |
47 | #define TM_YEAR (TM_DAY * 365) | 48 | #define TM_YEAR (TM_DAY * 365) |
48 | #define TM_MONTH (TM_YEAR / 12.0) | 49 | #define TM_MONTH (TM_YEAR / 12.0) |
49 | 50 | ||
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); |
52 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 58 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
53 | typedef void (*linediff_fn)(char *line, int len); | 59 | typedef void (*linediff_fn)(char *line, int len); |
54 | 60 | ||
55 | struct cacheitem { | 61 | struct cacheitem { |
56 | char *name; | 62 | char *name; |
@@ -87,12 +93,13 @@ struct commitinfo { | |||
87 | unsigned long author_date; | 93 | unsigned long author_date; |
88 | char *committer; | 94 | char *committer; |
89 | char *committer_email; | 95 | char *committer_email; |
90 | unsigned long committer_date; | 96 | unsigned long committer_date; |
91 | char *subject; | 97 | char *subject; |
92 | char *msg; | 98 | char *msg; |
99 | char *msg_encoding; | ||
93 | }; | 100 | }; |
94 | 101 | ||
95 | struct taginfo { | 102 | struct taginfo { |
96 | char *tagger; | 103 | char *tagger; |
97 | char *tagger_email; | 104 | char *tagger_email; |
98 | int tagger_date; | 105 | int tagger_date; |
@@ -196,12 +196,13 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
196 | ret->author = NULL; | 196 | ret->author = NULL; |
197 | ret->author_email = NULL; | 197 | ret->author_email = NULL; |
198 | ret->committer = NULL; | 198 | ret->committer = NULL; |
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | ret->msg_encoding = NULL; | ||
202 | 203 | ||
203 | if (p == NULL) | 204 | if (p == NULL) |
204 | return ret; | 205 | return ret; |
205 | 206 | ||
206 | if (strncmp(p, "tree ", 5)) | 207 | if (strncmp(p, "tree ", 5)) |
207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 208 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
@@ -230,12 +231,20 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
230 | t = strchr(t, '>') + 1; | 231 | t = strchr(t, '>') + 1; |
231 | ret->committer_email = substr(p, t); | 232 | ret->committer_email = substr(p, t); |
232 | ret->committer_date = atol(++t); | 233 | ret->committer_date = atol(++t); |
233 | p = strchr(t, '\n') + 1; | 234 | p = strchr(t, '\n') + 1; |
234 | } | 235 | } |
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')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 246 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 247 | ||
239 | while (*p == '\n') | 248 | while (*p == '\n') |
240 | p = strchr(p, '\n') + 1; | 249 | p = strchr(p, '\n') + 1; |
241 | 250 | ||
@@ -250,12 +259,28 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
250 | while (*p == '\n') | 259 | while (*p == '\n') |
251 | p = strchr(p, '\n') + 1; | 260 | p = strchr(p, '\n') + 1; |
252 | ret->msg = xstrdup(p); | 261 | ret->msg = xstrdup(p); |
253 | } else | 262 | } else |
254 | ret->subject = substr(p, p+strlen(p)); | 263 | ret->subject = substr(p, p+strlen(p)); |
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; |
257 | } | 282 | } |
258 | 283 | ||
259 | 284 | ||
260 | struct taginfo *cgit_parse_tag(struct tag *tag) | 285 | struct taginfo *cgit_parse_tag(struct tag *tag) |
261 | { | 286 | { |
@@ -262,12 +262,14 @@ void *cgit_free_commitinfo(struct commitinfo *info) | |||
262 | { | 262 | { |
263 | free(info->author); | 263 | free(info->author); |
264 | free(info->author_email); | 264 | free(info->author_email); |
265 | free(info->committer); | 265 | free(info->committer); |
266 | free(info->committer_email); | 266 | free(info->committer_email); |
267 | free(info->subject); | 267 | free(info->subject); |
268 | free(info->msg); | ||
269 | free(info->msg_encoding); | ||
268 | free(info); | 270 | free(info); |
269 | return NULL; | 271 | return NULL; |
270 | } | 272 | } |
271 | 273 | ||
272 | int hextoint(char c) | 274 | int hextoint(char c) |
273 | { | 275 | { |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -349,13 +349,13 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
349 | htmlf("<span class='age-years'>%.0f years</span>", | 349 | htmlf("<span class='age-years'>%.0f years</span>", |
350 | secs * 1.0 / TM_YEAR); | 350 | secs * 1.0 / TM_YEAR); |
351 | } | 351 | } |
352 | 352 | ||
353 | void cgit_print_docstart(char *title, struct cacheitem *item) | 353 | 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)); |
357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
358 | ttl_seconds(item->ttl))); | 358 | ttl_seconds(item->ttl))); |
359 | html("\n"); | 359 | html("\n"); |
360 | html(cgit_doctype); | 360 | html(cgit_doctype); |
361 | html("<html>\n"); | 361 | html("<html>\n"); |