|
diff --git a/parsing.c b/parsing.c index 30e7648..e8c7ab9 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -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 | { |
|