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
@@ -7,24 +7,25 @@ | |||
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
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 |
25 | #define CMD_COMMIT 2 | 26 | #define CMD_COMMIT 2 |
26 | #define CMD_DIFF 3 | 27 | #define CMD_DIFF 3 |
27 | #define CMD_TREE 4 | 28 | #define CMD_TREE 4 |
28 | #define CMD_BLOB 5 | 29 | #define CMD_BLOB 5 |
29 | #define CMD_SNAPSHOT 6 | 30 | #define CMD_SNAPSHOT 6 |
30 | #define CMD_TAG 7 | 31 | #define CMD_TAG 7 |
@@ -39,24 +40,29 @@ | |||
39 | 40 | ||
40 | /* | 41 | /* |
41 | * Limits used for relative dates | 42 | * Limits used for relative dates |
42 | */ | 43 | */ |
43 | #define TM_MIN 60 | 44 | #define TM_MIN 60 |
44 | #define TM_HOUR (TM_MIN * 60) | 45 | #define TM_HOUR (TM_MIN * 60) |
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; |
57 | struct stat st; | 63 | struct stat st; |
58 | int ttl; | 64 | int ttl; |
59 | int fd; | 65 | int fd; |
60 | }; | 66 | }; |
61 | 67 | ||
62 | struct repoinfo { | 68 | struct repoinfo { |
@@ -81,24 +87,25 @@ struct repolist { | |||
81 | }; | 87 | }; |
82 | 88 | ||
83 | struct commitinfo { | 89 | struct commitinfo { |
84 | struct commit *commit; | 90 | struct commit *commit; |
85 | char *author; | 91 | char *author; |
86 | char *author_email; | 92 | char *author_email; |
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; |
99 | char *msg; | 106 | char *msg; |
100 | }; | 107 | }; |
101 | 108 | ||
102 | struct refinfo { | 109 | struct refinfo { |
103 | const char *refname; | 110 | const char *refname; |
104 | struct object *object; | 111 | struct object *object; |
@@ -190,24 +190,25 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
190 | { | 190 | { |
191 | struct commitinfo *ret; | 191 | struct commitinfo *ret; |
192 | char *p = commit->buffer, *t = commit->buffer; | 192 | char *p = commit->buffer, *t = commit->buffer; |
193 | 193 | ||
194 | ret = xmalloc(sizeof(*ret)); | 194 | ret = xmalloc(sizeof(*ret)); |
195 | ret->commit = commit; | 195 | ret->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)); |
208 | else | 209 | else |
209 | p += 46; // "tree " + hex[40] + "\n" | 210 | p += 46; // "tree " + hex[40] + "\n" |
210 | 211 | ||
211 | while (!strncmp(p, "parent ", 7)) | 212 | while (!strncmp(p, "parent ", 7)) |
212 | p += 48; // "parent " + hex[40] + "\n" | 213 | p += 48; // "parent " + hex[40] + "\n" |
213 | 214 | ||
@@ -224,44 +225,68 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
224 | 225 | ||
225 | if (!strncmp(p, "committer ", 9)) { | 226 | if (!strncmp(p, "committer ", 9)) { |
226 | p += 9; | 227 | p += 9; |
227 | t = strchr(p, '<') - 1; | 228 | t = strchr(p, '<') - 1; |
228 | ret->committer = substr(p, t); | 229 | ret->committer = substr(p, t); |
229 | p = t; | 230 | p = t; |
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 | ||
242 | t = strchr(p, '\n'); | 251 | t = strchr(p, '\n'); |
243 | if (t) { | 252 | if (t) { |
244 | if (*t == '\0') | 253 | if (*t == '\0') |
245 | ret->subject = "** empty **"; | 254 | ret->subject = "** empty **"; |
246 | else | 255 | else |
247 | ret->subject = substr(p, t); | 256 | ret->subject = substr(p, t); |
248 | p = t + 1; | 257 | p = t + 1; |
249 | 258 | ||
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 | void *data; | 287 | void *data; |
263 | enum object_type type; | 288 | enum object_type type; |
264 | unsigned long size; | 289 | unsigned long size; |
265 | char *p, *t; | 290 | char *p, *t; |
266 | struct taginfo *ret; | 291 | struct taginfo *ret; |
267 | 292 | ||
@@ -256,24 +256,26 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
256 | } else if (!strcmp(name, "name")) { | 256 | } else if (!strcmp(name, "name")) { |
257 | cgit_query_name = xstrdup(value); | 257 | cgit_query_name = xstrdup(value); |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | void *cgit_free_commitinfo(struct commitinfo *info) | 261 | 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 | { |
274 | if (c >= 'a' && c <= 'f') | 276 | if (c >= 'a' && c <= 'f') |
275 | return 10 + c - 'a'; | 277 | return 10 + c - 'a'; |
276 | else if (c >= 'A' && c <= 'F') | 278 | else if (c >= 'A' && c <= 'F') |
277 | return 10 + c - 'A'; | 279 | return 10 + c - 'A'; |
278 | else if (c >= '0' && c <= '9') | 280 | else if (c >= '0' && c <= '9') |
279 | return c - '0'; | 281 | return c - '0'; |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -343,25 +343,25 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
343 | } | 343 | } |
344 | if (secs < TM_YEAR * 2) { | 344 | if (secs < TM_YEAR * 2) { |
345 | htmlf("<span class='age-months'>%.0f months</span>", | 345 | htmlf("<span class='age-months'>%.0f months</span>", |
346 | secs * 1.0 / TM_MONTH); | 346 | secs * 1.0 / TM_MONTH); |
347 | return; | 347 | return; |
348 | } | 348 | } |
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"); |
362 | html("<head>\n"); | 362 | html("<head>\n"); |
363 | html("<title>"); | 363 | html("<title>"); |
364 | html_txt(title); | 364 | html_txt(title); |
365 | html("</title>\n"); | 365 | html("</title>\n"); |
366 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 366 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
367 | html("<link rel='stylesheet' type='text/css' href='"); | 367 | html("<link rel='stylesheet' type='text/css' href='"); |