summaryrefslogtreecommitdiffabout
authorJonathan Bastien-Filiatrault <joe@x2a.org>2007-10-26 22:09:06 (UTC)
committer Jonathan Bastien-Filiatrault <joe@x2a.org>2007-11-05 23:13:30 (UTC)
commit3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b (patch) (unidiff)
tree548671b6339e9a1a252ded4d534f11bfcd560043
parent72ede12551af320b6d8eade853dbd2cd6f2222cc (diff)
downloadcgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.zip
cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.gz
cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.bz2
Add commit->msg_encoding, allocate msg dynamicly.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h6
-rw-r--r--parsing.c1
-rw-r--r--shared.c2
-rw-r--r--ui-shared.c2
4 files changed, 10 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 163f355..6c7a941 100644
--- a/cgit.h
+++ b/cgit.h
@@ -45,12 +45,17 @@
45#define TM_DAY (TM_HOUR * 24) 45#define TM_DAY (TM_HOUR * 24)
46#define TM_WEEK (TM_DAY * 7) 46#define TM_WEEK (TM_DAY * 7)
47#define TM_YEAR (TM_DAY * 365) 47#define TM_YEAR (TM_DAY * 365)
48#define TM_MONTH (TM_YEAR / 12.0) 48#define TM_MONTH (TM_YEAR / 12.0)
49 49
50 50
51/*
52 * Default encoding
53 */
54#define PAGE_ENCODING "UTF-8"
55
51typedef void (*configfn)(const char *name, const char *value); 56typedef void (*configfn)(const char *name, const char *value);
52typedef void (*filepair_fn)(struct diff_filepair *pair); 57typedef void (*filepair_fn)(struct diff_filepair *pair);
53typedef void (*linediff_fn)(char *line, int len); 58typedef void (*linediff_fn)(char *line, int len);
54 59
55struct cacheitem { 60struct cacheitem {
56 char *name; 61 char *name;
@@ -87,12 +92,13 @@ struct commitinfo {
87 unsigned long author_date; 92 unsigned long author_date;
88 char *committer; 93 char *committer;
89 char *committer_email; 94 char *committer_email;
90 unsigned long committer_date; 95 unsigned long committer_date;
91 char *subject; 96 char *subject;
92 char *msg; 97 char *msg;
98 char *msg_encoding;
93}; 99};
94 100
95struct taginfo { 101struct taginfo {
96 char *tagger; 102 char *tagger;
97 char *tagger_email; 103 char *tagger_email;
98 int tagger_date; 104 int tagger_date;
diff --git a/parsing.c b/parsing.c
index 30e7648..0412a9c 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));
diff --git a/shared.c b/shared.c
index e06df91..a04c4dc 100644
--- a/shared.c
+++ b/shared.c
@@ -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
272int hextoint(char c) 274int 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
353void cgit_print_docstart(char *title, struct cacheitem *item) 353void 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");