-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc | 2 | ||||
-rw-r--r-- | ui-shared.c | 5 |
4 files changed, 10 insertions, 0 deletions
@@ -1,155 +1,157 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | 15 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | void config_cb(const char *name, const char *value) | 18 | void config_cb(const char *name, const char *value) |
19 | { | 19 | { |
20 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | 22 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 23 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | 24 | else if (!strcmp(name, "root-readme")) |
25 | ctx.cfg.root_readme = xstrdup(value); | 25 | ctx.cfg.root_readme = xstrdup(value); |
26 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "favicon")) | ||
29 | ctx.cfg.favicon = xstrdup(value); | ||
28 | else if (!strcmp(name, "footer")) | 30 | else if (!strcmp(name, "footer")) |
29 | ctx.cfg.footer = xstrdup(value); | 31 | ctx.cfg.footer = xstrdup(value); |
30 | else if (!strcmp(name, "logo")) | 32 | else if (!strcmp(name, "logo")) |
31 | ctx.cfg.logo = xstrdup(value); | 33 | ctx.cfg.logo = xstrdup(value); |
32 | else if (!strcmp(name, "index-header")) | 34 | else if (!strcmp(name, "index-header")) |
33 | ctx.cfg.index_header = xstrdup(value); | 35 | ctx.cfg.index_header = xstrdup(value); |
34 | else if (!strcmp(name, "index-info")) | 36 | else if (!strcmp(name, "index-info")) |
35 | ctx.cfg.index_info = xstrdup(value); | 37 | ctx.cfg.index_info = xstrdup(value); |
36 | else if (!strcmp(name, "logo-link")) | 38 | else if (!strcmp(name, "logo-link")) |
37 | ctx.cfg.logo_link = xstrdup(value); | 39 | ctx.cfg.logo_link = xstrdup(value); |
38 | else if (!strcmp(name, "module-link")) | 40 | else if (!strcmp(name, "module-link")) |
39 | ctx.cfg.module_link = xstrdup(value); | 41 | ctx.cfg.module_link = xstrdup(value); |
40 | else if (!strcmp(name, "virtual-root")) { | 42 | else if (!strcmp(name, "virtual-root")) { |
41 | ctx.cfg.virtual_root = trim_end(value, '/'); | 43 | ctx.cfg.virtual_root = trim_end(value, '/'); |
42 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
43 | ctx.cfg.virtual_root = ""; | 45 | ctx.cfg.virtual_root = ""; |
44 | } else if (!strcmp(name, "nocache")) | 46 | } else if (!strcmp(name, "nocache")) |
45 | ctx.cfg.nocache = atoi(value); | 47 | ctx.cfg.nocache = atoi(value); |
46 | else if (!strcmp(name, "snapshots")) | 48 | else if (!strcmp(name, "snapshots")) |
47 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
48 | else if (!strcmp(name, "enable-index-links")) | 50 | else if (!strcmp(name, "enable-index-links")) |
49 | ctx.cfg.enable_index_links = atoi(value); | 51 | ctx.cfg.enable_index_links = atoi(value); |
50 | else if (!strcmp(name, "enable-log-filecount")) | 52 | else if (!strcmp(name, "enable-log-filecount")) |
51 | ctx.cfg.enable_log_filecount = atoi(value); | 53 | ctx.cfg.enable_log_filecount = atoi(value); |
52 | else if (!strcmp(name, "enable-log-linecount")) | 54 | else if (!strcmp(name, "enable-log-linecount")) |
53 | ctx.cfg.enable_log_linecount = atoi(value); | 55 | ctx.cfg.enable_log_linecount = atoi(value); |
54 | else if (!strcmp(name, "cache-size")) | 56 | else if (!strcmp(name, "cache-size")) |
55 | ctx.cfg.cache_size = atoi(value); | 57 | ctx.cfg.cache_size = atoi(value); |
56 | else if (!strcmp(name, "cache-root")) | 58 | else if (!strcmp(name, "cache-root")) |
57 | ctx.cfg.cache_root = xstrdup(value); | 59 | ctx.cfg.cache_root = xstrdup(value); |
58 | else if (!strcmp(name, "cache-root-ttl")) | 60 | else if (!strcmp(name, "cache-root-ttl")) |
59 | ctx.cfg.cache_root_ttl = atoi(value); | 61 | ctx.cfg.cache_root_ttl = atoi(value); |
60 | else if (!strcmp(name, "cache-repo-ttl")) | 62 | else if (!strcmp(name, "cache-repo-ttl")) |
61 | ctx.cfg.cache_repo_ttl = atoi(value); | 63 | ctx.cfg.cache_repo_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-static-ttl")) | 64 | else if (!strcmp(name, "cache-static-ttl")) |
63 | ctx.cfg.cache_static_ttl = atoi(value); | 65 | ctx.cfg.cache_static_ttl = atoi(value); |
64 | else if (!strcmp(name, "cache-dynamic-ttl")) | 66 | else if (!strcmp(name, "cache-dynamic-ttl")) |
65 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 67 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
66 | else if (!strcmp(name, "max-message-length")) | 68 | else if (!strcmp(name, "max-message-length")) |
67 | ctx.cfg.max_msg_len = atoi(value); | 69 | ctx.cfg.max_msg_len = atoi(value); |
68 | else if (!strcmp(name, "max-repodesc-length")) | 70 | else if (!strcmp(name, "max-repodesc-length")) |
69 | ctx.cfg.max_repodesc_len = atoi(value); | 71 | ctx.cfg.max_repodesc_len = atoi(value); |
70 | else if (!strcmp(name, "max-repo-count")) | 72 | else if (!strcmp(name, "max-repo-count")) |
71 | ctx.cfg.max_repo_count = atoi(value); | 73 | ctx.cfg.max_repo_count = atoi(value); |
72 | else if (!strcmp(name, "max-commit-count")) | 74 | else if (!strcmp(name, "max-commit-count")) |
73 | ctx.cfg.max_commit_count = atoi(value); | 75 | ctx.cfg.max_commit_count = atoi(value); |
74 | else if (!strcmp(name, "summary-log")) | 76 | else if (!strcmp(name, "summary-log")) |
75 | ctx.cfg.summary_log = atoi(value); | 77 | ctx.cfg.summary_log = atoi(value); |
76 | else if (!strcmp(name, "summary-branches")) | 78 | else if (!strcmp(name, "summary-branches")) |
77 | ctx.cfg.summary_branches = atoi(value); | 79 | ctx.cfg.summary_branches = atoi(value); |
78 | else if (!strcmp(name, "summary-tags")) | 80 | else if (!strcmp(name, "summary-tags")) |
79 | ctx.cfg.summary_tags = atoi(value); | 81 | ctx.cfg.summary_tags = atoi(value); |
80 | else if (!strcmp(name, "agefile")) | 82 | else if (!strcmp(name, "agefile")) |
81 | ctx.cfg.agefile = xstrdup(value); | 83 | ctx.cfg.agefile = xstrdup(value); |
82 | else if (!strcmp(name, "renamelimit")) | 84 | else if (!strcmp(name, "renamelimit")) |
83 | ctx.cfg.renamelimit = atoi(value); | 85 | ctx.cfg.renamelimit = atoi(value); |
84 | else if (!strcmp(name, "robots")) | 86 | else if (!strcmp(name, "robots")) |
85 | ctx.cfg.robots = xstrdup(value); | 87 | ctx.cfg.robots = xstrdup(value); |
86 | else if (!strcmp(name, "clone-prefix")) | 88 | else if (!strcmp(name, "clone-prefix")) |
87 | ctx.cfg.clone_prefix = xstrdup(value); | 89 | ctx.cfg.clone_prefix = xstrdup(value); |
88 | else if (!strcmp(name, "repo.group")) | 90 | else if (!strcmp(name, "repo.group")) |
89 | ctx.cfg.repo_group = xstrdup(value); | 91 | ctx.cfg.repo_group = xstrdup(value); |
90 | else if (!strcmp(name, "repo.url")) | 92 | else if (!strcmp(name, "repo.url")) |
91 | ctx.repo = cgit_add_repo(value); | 93 | ctx.repo = cgit_add_repo(value); |
92 | else if (!strcmp(name, "repo.name")) | 94 | else if (!strcmp(name, "repo.name")) |
93 | ctx.repo->name = xstrdup(value); | 95 | ctx.repo->name = xstrdup(value); |
94 | else if (ctx.repo && !strcmp(name, "repo.path")) | 96 | else if (ctx.repo && !strcmp(name, "repo.path")) |
95 | ctx.repo->path = trim_end(value, '/'); | 97 | ctx.repo->path = trim_end(value, '/'); |
96 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 98 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
97 | ctx.repo->clone_url = xstrdup(value); | 99 | ctx.repo->clone_url = xstrdup(value); |
98 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 100 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
99 | ctx.repo->desc = xstrdup(value); | 101 | ctx.repo->desc = xstrdup(value); |
100 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 102 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
101 | ctx.repo->owner = xstrdup(value); | 103 | ctx.repo->owner = xstrdup(value); |
102 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 104 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
103 | ctx.repo->defbranch = xstrdup(value); | 105 | ctx.repo->defbranch = xstrdup(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 106 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
105 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 107 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
106 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 108 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
107 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 109 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 110 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
109 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 111 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 112 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
111 | ctx.repo->module_link= xstrdup(value); | 113 | ctx.repo->module_link= xstrdup(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 114 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
113 | if (*value == '/') | 115 | if (*value == '/') |
114 | ctx.repo->readme = xstrdup(value); | 116 | ctx.repo->readme = xstrdup(value); |
115 | else | 117 | else |
116 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 118 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
117 | } else if (!strcmp(name, "include")) | 119 | } else if (!strcmp(name, "include")) |
118 | parse_configfile(value, config_cb); | 120 | parse_configfile(value, config_cb); |
119 | } | 121 | } |
120 | 122 | ||
121 | static void querystring_cb(const char *name, const char *value) | 123 | static void querystring_cb(const char *name, const char *value) |
122 | { | 124 | { |
123 | if (!strcmp(name,"r")) { | 125 | if (!strcmp(name,"r")) { |
124 | ctx.qry.repo = xstrdup(value); | 126 | ctx.qry.repo = xstrdup(value); |
125 | ctx.repo = cgit_get_repoinfo(value); | 127 | ctx.repo = cgit_get_repoinfo(value); |
126 | } else if (!strcmp(name, "p")) { | 128 | } else if (!strcmp(name, "p")) { |
127 | ctx.qry.page = xstrdup(value); | 129 | ctx.qry.page = xstrdup(value); |
128 | } else if (!strcmp(name, "url")) { | 130 | } else if (!strcmp(name, "url")) { |
129 | cgit_parse_url(value); | 131 | cgit_parse_url(value); |
130 | } else if (!strcmp(name, "qt")) { | 132 | } else if (!strcmp(name, "qt")) { |
131 | ctx.qry.grep = xstrdup(value); | 133 | ctx.qry.grep = xstrdup(value); |
132 | } else if (!strcmp(name, "q")) { | 134 | } else if (!strcmp(name, "q")) { |
133 | ctx.qry.search = xstrdup(value); | 135 | ctx.qry.search = xstrdup(value); |
134 | } else if (!strcmp(name, "h")) { | 136 | } else if (!strcmp(name, "h")) { |
135 | ctx.qry.head = xstrdup(value); | 137 | ctx.qry.head = xstrdup(value); |
136 | ctx.qry.has_symref = 1; | 138 | ctx.qry.has_symref = 1; |
137 | } else if (!strcmp(name, "id")) { | 139 | } else if (!strcmp(name, "id")) { |
138 | ctx.qry.sha1 = xstrdup(value); | 140 | ctx.qry.sha1 = xstrdup(value); |
139 | ctx.qry.has_sha1 = 1; | 141 | ctx.qry.has_sha1 = 1; |
140 | } else if (!strcmp(name, "id2")) { | 142 | } else if (!strcmp(name, "id2")) { |
141 | ctx.qry.sha2 = xstrdup(value); | 143 | ctx.qry.sha2 = xstrdup(value); |
142 | ctx.qry.has_sha1 = 1; | 144 | ctx.qry.has_sha1 = 1; |
143 | } else if (!strcmp(name, "ofs")) { | 145 | } else if (!strcmp(name, "ofs")) { |
144 | ctx.qry.ofs = atoi(value); | 146 | ctx.qry.ofs = atoi(value); |
145 | } else if (!strcmp(name, "path")) { | 147 | } else if (!strcmp(name, "path")) { |
146 | ctx.qry.path = trim_end(value, '/'); | 148 | ctx.qry.path = trim_end(value, '/'); |
147 | } else if (!strcmp(name, "name")) { | 149 | } else if (!strcmp(name, "name")) { |
148 | ctx.qry.name = xstrdup(value); | 150 | ctx.qry.name = xstrdup(value); |
149 | } else if (!strcmp(name, "mimetype")) { | 151 | } else if (!strcmp(name, "mimetype")) { |
150 | ctx.qry.mimetype = xstrdup(value); | 152 | ctx.qry.mimetype = xstrdup(value); |
151 | } | 153 | } |
152 | } | 154 | } |
153 | 155 | ||
154 | static void prepare_context(struct cgit_context *ctx) | 156 | static void prepare_context(struct cgit_context *ctx) |
155 | { | 157 | { |
@@ -1,237 +1,238 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
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 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Dateformats used on misc. pages | 23 | * Dateformats used on misc. pages |
24 | */ | 24 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | 27 | ||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Limits used for relative dates | 30 | * Limits used for relative dates |
31 | */ | 31 | */ |
32 | #define TM_MIN 60 | 32 | #define TM_MIN 60 |
33 | #define TM_HOUR (TM_MIN * 60) | 33 | #define TM_HOUR (TM_MIN * 60) |
34 | #define TM_DAY (TM_HOUR * 24) | 34 | #define TM_DAY (TM_HOUR * 24) |
35 | #define TM_WEEK (TM_DAY * 7) | 35 | #define TM_WEEK (TM_DAY * 7) |
36 | #define TM_YEAR (TM_DAY * 365) | 36 | #define TM_YEAR (TM_DAY * 365) |
37 | #define TM_MONTH (TM_YEAR / 12.0) | 37 | #define TM_MONTH (TM_YEAR / 12.0) |
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Default encoding | 41 | * Default encoding |
42 | */ | 42 | */ |
43 | #define PAGE_ENCODING "UTF-8" | 43 | #define PAGE_ENCODING "UTF-8" |
44 | 44 | ||
45 | typedef void (*configfn)(const char *name, const char *value); | 45 | typedef void (*configfn)(const char *name, const char *value); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
47 | typedef void (*linediff_fn)(char *line, int len); | 47 | typedef void (*linediff_fn)(char *line, int len); |
48 | 48 | ||
49 | struct cgit_repo { | 49 | struct cgit_repo { |
50 | char *url; | 50 | char *url; |
51 | char *name; | 51 | char *name; |
52 | char *path; | 52 | char *path; |
53 | char *desc; | 53 | char *desc; |
54 | char *owner; | 54 | char *owner; |
55 | char *defbranch; | 55 | char *defbranch; |
56 | char *group; | 56 | char *group; |
57 | char *module_link; | 57 | char *module_link; |
58 | char *readme; | 58 | char *readme; |
59 | char *clone_url; | 59 | char *clone_url; |
60 | int snapshots; | 60 | int snapshots; |
61 | int enable_log_filecount; | 61 | int enable_log_filecount; |
62 | int enable_log_linecount; | 62 | int enable_log_linecount; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | struct cgit_repolist { | 65 | struct cgit_repolist { |
66 | int length; | 66 | int length; |
67 | int count; | 67 | int count; |
68 | struct cgit_repo *repos; | 68 | struct cgit_repo *repos; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct commitinfo { | 71 | struct commitinfo { |
72 | struct commit *commit; | 72 | struct commit *commit; |
73 | char *author; | 73 | char *author; |
74 | char *author_email; | 74 | char *author_email; |
75 | unsigned long author_date; | 75 | unsigned long author_date; |
76 | char *committer; | 76 | char *committer; |
77 | char *committer_email; | 77 | char *committer_email; |
78 | unsigned long committer_date; | 78 | unsigned long committer_date; |
79 | char *subject; | 79 | char *subject; |
80 | char *msg; | 80 | char *msg; |
81 | char *msg_encoding; | 81 | char *msg_encoding; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct taginfo { | 84 | struct taginfo { |
85 | char *tagger; | 85 | char *tagger; |
86 | char *tagger_email; | 86 | char *tagger_email; |
87 | int tagger_date; | 87 | int tagger_date; |
88 | char *msg; | 88 | char *msg; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct refinfo { | 91 | struct refinfo { |
92 | const char *refname; | 92 | const char *refname; |
93 | struct object *object; | 93 | struct object *object; |
94 | union { | 94 | union { |
95 | struct taginfo *tag; | 95 | struct taginfo *tag; |
96 | struct commitinfo *commit; | 96 | struct commitinfo *commit; |
97 | }; | 97 | }; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct reflist { | 100 | struct reflist { |
101 | struct refinfo **refs; | 101 | struct refinfo **refs; |
102 | int alloc; | 102 | int alloc; |
103 | int count; | 103 | int count; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct cgit_query { | 106 | struct cgit_query { |
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | char *mimetype; | 119 | char *mimetype; |
120 | int ofs; | 120 | int ofs; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct cgit_config { | 123 | struct cgit_config { |
124 | char *agefile; | 124 | char *agefile; |
125 | char *cache_root; | 125 | char *cache_root; |
126 | char *clone_prefix; | 126 | char *clone_prefix; |
127 | char *css; | 127 | char *css; |
128 | char *favicon; | ||
128 | char *footer; | 129 | char *footer; |
129 | char *index_header; | 130 | char *index_header; |
130 | char *index_info; | 131 | char *index_info; |
131 | char *logo; | 132 | char *logo; |
132 | char *logo_link; | 133 | char *logo_link; |
133 | char *module_link; | 134 | char *module_link; |
134 | char *repo_group; | 135 | char *repo_group; |
135 | char *robots; | 136 | char *robots; |
136 | char *root_title; | 137 | char *root_title; |
137 | char *root_desc; | 138 | char *root_desc; |
138 | char *root_readme; | 139 | char *root_readme; |
139 | char *script_name; | 140 | char *script_name; |
140 | char *virtual_root; | 141 | char *virtual_root; |
141 | int cache_size; | 142 | int cache_size; |
142 | int cache_dynamic_ttl; | 143 | int cache_dynamic_ttl; |
143 | int cache_max_create_time; | 144 | int cache_max_create_time; |
144 | int cache_repo_ttl; | 145 | int cache_repo_ttl; |
145 | int cache_root_ttl; | 146 | int cache_root_ttl; |
146 | int cache_static_ttl; | 147 | int cache_static_ttl; |
147 | int enable_index_links; | 148 | int enable_index_links; |
148 | int enable_log_filecount; | 149 | int enable_log_filecount; |
149 | int enable_log_linecount; | 150 | int enable_log_linecount; |
150 | int max_repo_count; | 151 | int max_repo_count; |
151 | int max_commit_count; | 152 | int max_commit_count; |
152 | int max_lock_attempts; | 153 | int max_lock_attempts; |
153 | int max_msg_len; | 154 | int max_msg_len; |
154 | int max_repodesc_len; | 155 | int max_repodesc_len; |
155 | int nocache; | 156 | int nocache; |
156 | int renamelimit; | 157 | int renamelimit; |
157 | int snapshots; | 158 | int snapshots; |
158 | int summary_branches; | 159 | int summary_branches; |
159 | int summary_log; | 160 | int summary_log; |
160 | int summary_tags; | 161 | int summary_tags; |
161 | }; | 162 | }; |
162 | 163 | ||
163 | struct cgit_page { | 164 | struct cgit_page { |
164 | time_t modified; | 165 | time_t modified; |
165 | time_t expires; | 166 | time_t expires; |
166 | char *mimetype; | 167 | char *mimetype; |
167 | char *charset; | 168 | char *charset; |
168 | char *filename; | 169 | char *filename; |
169 | char *title; | 170 | char *title; |
170 | }; | 171 | }; |
171 | 172 | ||
172 | struct cgit_context { | 173 | struct cgit_context { |
173 | struct cgit_query qry; | 174 | struct cgit_query qry; |
174 | struct cgit_config cfg; | 175 | struct cgit_config cfg; |
175 | struct cgit_repo *repo; | 176 | struct cgit_repo *repo; |
176 | struct cgit_page page; | 177 | struct cgit_page page; |
177 | }; | 178 | }; |
178 | 179 | ||
179 | struct cgit_snapshot_format { | 180 | struct cgit_snapshot_format { |
180 | const char *suffix; | 181 | const char *suffix; |
181 | const char *mimetype; | 182 | const char *mimetype; |
182 | write_archive_fn_t write_func; | 183 | write_archive_fn_t write_func; |
183 | int bit; | 184 | int bit; |
184 | }; | 185 | }; |
185 | 186 | ||
186 | extern const char *cgit_version; | 187 | extern const char *cgit_version; |
187 | 188 | ||
188 | extern struct cgit_repolist cgit_repolist; | 189 | extern struct cgit_repolist cgit_repolist; |
189 | extern struct cgit_context ctx; | 190 | extern struct cgit_context ctx; |
190 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 191 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
191 | 192 | ||
192 | extern struct cgit_repo *cgit_add_repo(const char *url); | 193 | extern struct cgit_repo *cgit_add_repo(const char *url); |
193 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 194 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
194 | extern void cgit_repo_config_cb(const char *name, const char *value); | 195 | extern void cgit_repo_config_cb(const char *name, const char *value); |
195 | 196 | ||
196 | extern int chk_zero(int result, char *msg); | 197 | extern int chk_zero(int result, char *msg); |
197 | extern int chk_positive(int result, char *msg); | 198 | extern int chk_positive(int result, char *msg); |
198 | extern int chk_non_negative(int result, char *msg); | 199 | extern int chk_non_negative(int result, char *msg); |
199 | 200 | ||
200 | extern char *trim_end(const char *str, char c); | 201 | extern char *trim_end(const char *str, char c); |
201 | extern char *strlpart(char *txt, int maxlen); | 202 | extern char *strlpart(char *txt, int maxlen); |
202 | extern char *strrpart(char *txt, int maxlen); | 203 | extern char *strrpart(char *txt, int maxlen); |
203 | 204 | ||
204 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 205 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
205 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 206 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
206 | int flags, void *cb_data); | 207 | int flags, void *cb_data); |
207 | 208 | ||
208 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 209 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
209 | 210 | ||
210 | extern int cgit_diff_files(const unsigned char *old_sha1, | 211 | extern int cgit_diff_files(const unsigned char *old_sha1, |
211 | const unsigned char *new_sha1, | 212 | const unsigned char *new_sha1, |
212 | linediff_fn fn); | 213 | linediff_fn fn); |
213 | 214 | ||
214 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 215 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
215 | const unsigned char *new_sha1, | 216 | const unsigned char *new_sha1, |
216 | filepair_fn fn, const char *prefix); | 217 | filepair_fn fn, const char *prefix); |
217 | 218 | ||
218 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 219 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
219 | 220 | ||
220 | extern char *fmt(const char *format,...); | 221 | extern char *fmt(const char *format,...); |
221 | 222 | ||
222 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 223 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
223 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 224 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
224 | extern void cgit_parse_url(const char *url); | 225 | extern void cgit_parse_url(const char *url); |
225 | 226 | ||
226 | extern const char *cgit_repobasename(const char *reponame); | 227 | extern const char *cgit_repobasename(const char *reponame); |
227 | 228 | ||
228 | extern int cgit_parse_snapshots_mask(const char *str); | 229 | extern int cgit_parse_snapshots_mask(const char *str); |
229 | 230 | ||
230 | /* libgit.a either links against or compiles its own implementation of | 231 | /* libgit.a either links against or compiles its own implementation of |
231 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it | 232 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it |
232 | * seems to do the trick. | 233 | * seems to do the trick. |
233 | */ | 234 | */ |
234 | extern char *strcasestr(const char *haystack, const char *needle); | 235 | extern char *strcasestr(const char *haystack, const char *needle); |
235 | 236 | ||
236 | 237 | ||
237 | #endif /* CGIT_H */ | 238 | #endif /* CGIT_H */ |
@@ -1,198 +1,200 @@ | |||
1 | ## | 1 | ## |
2 | ## cgitrc: template for /etc/cgitrc | 2 | ## cgitrc: template for /etc/cgitrc |
3 | ## | 3 | ## |
4 | 4 | ||
5 | 5 | ||
6 | ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly | 6 | ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly |
7 | ## usefull for testing. | 7 | ## usefull for testing. |
8 | #nocache=0 | 8 | #nocache=0 |
9 | 9 | ||
10 | 10 | ||
11 | ## This variable can be used to override the default value for "robots" | 11 | ## This variable can be used to override the default value for "robots" |
12 | ## meta-tag. If unset, the meta-tag isn't generated. | 12 | ## meta-tag. If unset, the meta-tag isn't generated. |
13 | #robots=index, nofollow | 13 | #robots=index, nofollow |
14 | 14 | ||
15 | 15 | ||
16 | ## Set allowed snapshot types by default. Can be overridden per repo | 16 | ## Set allowed snapshot types by default. Can be overridden per repo |
17 | # can be any combination of zip/tar.gz/tar.bz2/tar | 17 | # can be any combination of zip/tar.gz/tar.bz2/tar |
18 | #snapshots=0 | 18 | #snapshots=0 |
19 | 19 | ||
20 | 20 | ||
21 | ## Enable/disable extra links to summary/log/tree per repo on index page | 21 | ## Enable/disable extra links to summary/log/tree per repo on index page |
22 | #enable-index-links=0 | 22 | #enable-index-links=0 |
23 | 23 | ||
24 | 24 | ||
25 | ## Enable/disable display of 'number of files changed' in log view | 25 | ## Enable/disable display of 'number of files changed' in log view |
26 | #enable-log-filecount=0 | 26 | #enable-log-filecount=0 |
27 | 27 | ||
28 | 28 | ||
29 | ## Enable/disable display of 'number of lines changed' in log view | 29 | ## Enable/disable display of 'number of lines changed' in log view |
30 | #enable-log-linecount=0 | 30 | #enable-log-linecount=0 |
31 | 31 | ||
32 | 32 | ||
33 | ## Enable/disable display of HEAD shortlog in summary view. Set it to maximum | 33 | ## Enable/disable display of HEAD shortlog in summary view. Set it to maximum |
34 | ## number of commits that should be displayed | 34 | ## number of commits that should be displayed |
35 | #summary-log=0 | 35 | #summary-log=0 |
36 | 36 | ||
37 | 37 | ||
38 | ## Restrict the number of branches printed in summary view. Set to 0 to | 38 | ## Restrict the number of branches printed in summary view. Set to 0 to |
39 | ## print all branches. | 39 | ## print all branches. |
40 | #summary-branches=0 | 40 | #summary-branches=0 |
41 | 41 | ||
42 | 42 | ||
43 | ## Restrict the number of tags printed in summary view. Set to 0 to | 43 | ## Restrict the number of tags printed in summary view. Set to 0 to |
44 | ## print all tags. | 44 | ## print all tags. |
45 | #summary-tags=0 | 45 | #summary-tags=0 |
46 | 46 | ||
47 | 47 | ||
48 | ## The "Idle" column on the repository index page can read a timestamp | 48 | ## The "Idle" column on the repository index page can read a timestamp |
49 | ## from the specified agefile (if this file cannot be found, the mtime | 49 | ## from the specified agefile (if this file cannot be found, the mtime |
50 | ## of HEAD is used). | 50 | ## of HEAD is used). |
51 | ## The cgit repo on hjemli.net uses the the following command in it's | 51 | ## The cgit repo on hjemli.net uses the the following command in it's |
52 | ## post-receive hook to update the age-file: | 52 | ## post-receive hook to update the age-file: |
53 | ## git-for-each-ref --format="%(committerdate)" --sort=-committerdate \ | 53 | ## git-for-each-ref --format="%(committerdate)" --sort=-committerdate \ |
54 | ## --count=1 > $GIT_DIR/info/web/last-modifie | 54 | ## --count=1 > $GIT_DIR/info/web/last-modifie |
55 | ## | 55 | ## |
56 | #agefile=info/web/last-modified | 56 | #agefile=info/web/last-modified |
57 | 57 | ||
58 | 58 | ||
59 | ## Git detects renames, but with a limit on the number of files to | 59 | ## Git detects renames, but with a limit on the number of files to |
60 | ## consider. This option can be used to specify another limit (or -1 to | 60 | ## consider. This option can be used to specify another limit (or -1 to |
61 | ## use the default limit). | 61 | ## use the default limit). |
62 | ## | 62 | ## |
63 | #renamelimit=-1 | 63 | #renamelimit=-1 |
64 | 64 | ||
65 | 65 | ||
66 | ## Specify a root for virtual urls. This makes cgit generate urls like | 66 | ## Specify a root for virtual urls. This makes cgit generate urls like |
67 | ## | 67 | ## |
68 | ## http://localhost/git/repo/log/?h=branch | 68 | ## http://localhost/git/repo/log/?h=branch |
69 | ## | 69 | ## |
70 | ## instead of | 70 | ## instead of |
71 | ## | 71 | ## |
72 | ## http://localhost/cgit/cgit.cgi?url=repo/log&h=branch | 72 | ## http://localhost/cgit/cgit.cgi?url=repo/log&h=branch |
73 | ## | 73 | ## |
74 | ## For this to work with apache, a rewrite rule must be added to httpd.conf, | 74 | ## For this to work with apache, a rewrite rule must be added to httpd.conf, |
75 | ## possibly looking something like this: | 75 | ## possibly looking something like this: |
76 | ## | 76 | ## |
77 | ## RewriteRule ^/git/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA] | 77 | ## RewriteRule ^/git/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA] |
78 | ## | 78 | ## |
79 | ## For this to work with lighttpd, the rewrite rule should look more like this: | 79 | ## For this to work with lighttpd, the rewrite rule should look more like this: |
80 | ## | 80 | ## |
81 | ## url.rewrite = ( | 81 | ## url.rewrite = ( |
82 | ## "^/git/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2" | 82 | ## "^/git/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2" |
83 | ## ) | 83 | ## ) |
84 | ## | 84 | ## |
85 | ## This setting is disabled by default. | 85 | ## This setting is disabled by default. |
86 | #virtual-root=/git | 86 | #virtual-root=/git |
87 | 87 | ||
88 | 88 | ||
89 | ## Set the title printed on the root page | 89 | ## Set the title printed on the root page |
90 | #root-title=Git repository browser | 90 | #root-title=Git repository browser |
91 | 91 | ||
92 | 92 | ||
93 | ## Set the description printed on the root page | 93 | ## Set the description printed on the root page |
94 | #root-desc=a fast web interface for the git dscm | 94 | #root-desc=a fast web interface for the git dscm |
95 | 95 | ||
96 | 96 | ||
97 | ## If specified, the file at this path will be included as HTML in the | 97 | ## If specified, the file at this path will be included as HTML in the |
98 | ## sidebar on the repository index page | 98 | ## sidebar on the repository index page |
99 | #index-info= | 99 | #index-info= |
100 | 100 | ||
101 | 101 | ||
102 | ## If specified, the file at this path will be included as HTML above | 102 | ## If specified, the file at this path will be included as HTML above |
103 | ## the repository index | 103 | ## the repository index |
104 | #index-header= | 104 | #index-header= |
105 | 105 | ||
106 | 106 | ||
107 | ## Link to css file | 107 | ## Link to css file |
108 | #css=/cgit/cgit.css | 108 | #css=/cgit/cgit.css |
109 | 109 | ||
110 | ## Link to favicon | ||
111 | #favicon=/favicon.ico | ||
110 | 112 | ||
111 | ## Link to logo file | 113 | ## Link to logo file |
112 | #logo=/cgit/git-logo.png | 114 | #logo=/cgit/git-logo.png |
113 | 115 | ||
114 | 116 | ||
115 | ## Url loaded when clicking the logo | 117 | ## Url loaded when clicking the logo |
116 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ | 118 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ |
117 | 119 | ||
118 | 120 | ||
119 | ## Url loaded when clicking a submodule link | 121 | ## Url loaded when clicking a submodule link |
120 | #module-link=./?repo=%s&page=commit&id=%s | 122 | #module-link=./?repo=%s&page=commit&id=%s |
121 | 123 | ||
122 | 124 | ||
123 | ## Shared prefix which, when combined with repo url, becomes the url used | 125 | ## Shared prefix which, when combined with repo url, becomes the url used |
124 | ## to clone the repo | 126 | ## to clone the repo |
125 | #clone-prefix= | 127 | #clone-prefix= |
126 | 128 | ||
127 | 129 | ||
128 | ## Number of chars shown of repo description (in repolist view) | 130 | ## Number of chars shown of repo description (in repolist view) |
129 | #max-repodesc-length=60 | 131 | #max-repodesc-length=60 |
130 | 132 | ||
131 | 133 | ||
132 | ## Number of chars shown of commit subject message (in log view) | 134 | ## Number of chars shown of commit subject message (in log view) |
133 | #max-message-length=60 | 135 | #max-message-length=60 |
134 | 136 | ||
135 | 137 | ||
136 | ## Number of commits per page in log view | 138 | ## Number of commits per page in log view |
137 | #max-commit-count=50 | 139 | #max-commit-count=50 |
138 | 140 | ||
139 | 141 | ||
140 | ## Root of cached output | 142 | ## Root of cached output |
141 | #cache-root=/var/cache/cgit | 143 | #cache-root=/var/cache/cgit |
142 | 144 | ||
143 | 145 | ||
144 | ## Include another config-file | 146 | ## Include another config-file |
145 | #include=/var/cgit/repolist | 147 | #include=/var/cgit/repolist |
146 | 148 | ||
147 | ## | 149 | ## |
148 | ## Time-To-Live settings: specifies how long (in minutes) different pages | 150 | ## Time-To-Live settings: specifies how long (in minutes) different pages |
149 | ## should be cached (0 for instant expiration, -1 for immortal pages) | 151 | ## should be cached (0 for instant expiration, -1 for immortal pages) |
150 | ## | 152 | ## |
151 | 153 | ||
152 | ## ttl for root page | 154 | ## ttl for root page |
153 | #cache-root-ttl=5 | 155 | #cache-root-ttl=5 |
154 | 156 | ||
155 | ## ttl for repo summary page | 157 | ## ttl for repo summary page |
156 | #cache-repo-ttl=5 | 158 | #cache-repo-ttl=5 |
157 | 159 | ||
158 | ## ttl for other dynamic pages | 160 | ## ttl for other dynamic pages |
159 | #cache-dynamic-ttl=5 | 161 | #cache-dynamic-ttl=5 |
160 | 162 | ||
161 | ## ttl for static pages (addressed by SHA-1) | 163 | ## ttl for static pages (addressed by SHA-1) |
162 | #cache-static-ttl=-1 | 164 | #cache-static-ttl=-1 |
163 | 165 | ||
164 | 166 | ||
165 | 167 | ||
166 | ## Example repository entry. Required values are repo.url and repo.path (each | 168 | ## Example repository entry. Required values are repo.url and repo.path (each |
167 | ## repository section must start with repo.url). | 169 | ## repository section must start with repo.url). |
168 | #repo.url=cgit | 170 | #repo.url=cgit |
169 | #repo.name=cgit | 171 | #repo.name=cgit |
170 | #repo.desc=the caching cgi for git | 172 | #repo.desc=the caching cgi for git |
171 | #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR | 173 | #repo.path=/pub/git/cgit ## this is the path to $GIT_DIR |
172 | #repo.owner=Lars Hjemli | 174 | #repo.owner=Lars Hjemli |
173 | #repo.defbranch=master ## define a default branch | 175 | #repo.defbranch=master ## define a default branch |
174 | #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting | 176 | #repo.snapshots=tar.bz2 ## override a sitewide snapshot-setting |
175 | #repo.enable-log-filecount=0 ## override the default filecount setting | 177 | #repo.enable-log-filecount=0 ## override the default filecount setting |
176 | #repo.enable-log-linecount=0 ## override the default linecount setting | 178 | #repo.enable-log-linecount=0 ## override the default linecount setting |
177 | #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link | 179 | #repo.module-link=/git/%s/commit/?id=%s ## override the standard module-link |
178 | #repo.readme=info/web/readme ## specify a file to include on summary page | 180 | #repo.readme=info/web/readme ## specify a file to include on summary page |
179 | #repo.clone-url=git://hjemli.net/pub/git/cgit | 181 | #repo.clone-url=git://hjemli.net/pub/git/cgit |
180 | 182 | ||
181 | ## Additional repositories grouped under "mirrors" | 183 | ## Additional repositories grouped under "mirrors" |
182 | #repo.group=mirrors | 184 | #repo.group=mirrors |
183 | 185 | ||
184 | #repo.url=git | 186 | #repo.url=git |
185 | #repo.path=/pub/git/git | 187 | #repo.path=/pub/git/git |
186 | #repo.clone-url=git://hjemli.net/pub/git/git | 188 | #repo.clone-url=git://hjemli.net/pub/git/git |
187 | # | 189 | # |
188 | #repo.url=linux | 190 | #repo.url=linux |
189 | #repo.path=/pub/git/linux | 191 | #repo.path=/pub/git/linux |
190 | 192 | ||
191 | ## A group of private repositories (with a working directory) | 193 | ## A group of private repositories (with a working directory) |
192 | #repo.group=private | 194 | #repo.group=private |
193 | 195 | ||
194 | #repo.url=larsh/cgit | 196 | #repo.url=larsh/cgit |
195 | #repo.path=/home/larsh/src/cgit/.git | 197 | #repo.path=/home/larsh/src/cgit/.git |
196 | 198 | ||
197 | #repo.url=larsh/git | 199 | #repo.url=larsh/git |
198 | #repo.path=/home/larsh/src/git/.git | 200 | #repo.path=/home/larsh/src/git/.git |
diff --git a/ui-shared.c b/ui-shared.c index 8a00099..6f83d2a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -312,256 +312,261 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
312 | } | 312 | } |
313 | if (old_rev) { | 313 | if (old_rev) { |
314 | html(delim); | 314 | html(delim); |
315 | html("id2="); | 315 | html("id2="); |
316 | html_attr(old_rev); | 316 | html_attr(old_rev); |
317 | } | 317 | } |
318 | html("'>"); | 318 | html("'>"); |
319 | html_txt(name); | 319 | html_txt(name); |
320 | html("</a>"); | 320 | html("</a>"); |
321 | } | 321 | } |
322 | 322 | ||
323 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 323 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
324 | char *rev) | 324 | char *rev) |
325 | { | 325 | { |
326 | reporevlink("patch", name, title, class, head, rev, NULL); | 326 | reporevlink("patch", name, title, class, head, rev, NULL); |
327 | } | 327 | } |
328 | 328 | ||
329 | void cgit_object_link(struct object *obj) | 329 | void cgit_object_link(struct object *obj) |
330 | { | 330 | { |
331 | char *page, *arg, *url; | 331 | char *page, *arg, *url; |
332 | 332 | ||
333 | if (obj->type == OBJ_COMMIT) { | 333 | if (obj->type == OBJ_COMMIT) { |
334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
335 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 335 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
336 | return; | 336 | return; |
337 | } else if (obj->type == OBJ_TREE) { | 337 | } else if (obj->type == OBJ_TREE) { |
338 | page = "tree"; | 338 | page = "tree"; |
339 | arg = "id"; | 339 | arg = "id"; |
340 | } else if (obj->type == OBJ_TAG) { | 340 | } else if (obj->type == OBJ_TAG) { |
341 | page = "tag"; | 341 | page = "tag"; |
342 | arg = "id"; | 342 | arg = "id"; |
343 | } else { | 343 | } else { |
344 | page = "blob"; | 344 | page = "blob"; |
345 | arg = "id"; | 345 | arg = "id"; |
346 | } | 346 | } |
347 | 347 | ||
348 | url = cgit_pageurl(ctx.qry.repo, page, | 348 | url = cgit_pageurl(ctx.qry.repo, page, |
349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
350 | html_link_open(url, NULL, NULL); | 350 | html_link_open(url, NULL, NULL); |
351 | htmlf("%s %s", typename(obj->type), | 351 | htmlf("%s %s", typename(obj->type), |
352 | sha1_to_hex(obj->sha1)); | 352 | sha1_to_hex(obj->sha1)); |
353 | html_link_close(); | 353 | html_link_close(); |
354 | } | 354 | } |
355 | 355 | ||
356 | void cgit_print_date(time_t secs, char *format) | 356 | void cgit_print_date(time_t secs, char *format) |
357 | { | 357 | { |
358 | char buf[64]; | 358 | char buf[64]; |
359 | struct tm *time; | 359 | struct tm *time; |
360 | 360 | ||
361 | if (!secs) | 361 | if (!secs) |
362 | return; | 362 | return; |
363 | time = gmtime(&secs); | 363 | time = gmtime(&secs); |
364 | strftime(buf, sizeof(buf)-1, format, time); | 364 | strftime(buf, sizeof(buf)-1, format, time); |
365 | html_txt(buf); | 365 | html_txt(buf); |
366 | } | 366 | } |
367 | 367 | ||
368 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 368 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
369 | { | 369 | { |
370 | time_t now, secs; | 370 | time_t now, secs; |
371 | 371 | ||
372 | if (!t) | 372 | if (!t) |
373 | return; | 373 | return; |
374 | time(&now); | 374 | time(&now); |
375 | secs = now - t; | 375 | secs = now - t; |
376 | 376 | ||
377 | if (secs > max_relative && max_relative >= 0) { | 377 | if (secs > max_relative && max_relative >= 0) { |
378 | cgit_print_date(t, format); | 378 | cgit_print_date(t, format); |
379 | return; | 379 | return; |
380 | } | 380 | } |
381 | 381 | ||
382 | if (secs < TM_HOUR * 2) { | 382 | if (secs < TM_HOUR * 2) { |
383 | htmlf("<span class='age-mins'>%.0f min.</span>", | 383 | htmlf("<span class='age-mins'>%.0f min.</span>", |
384 | secs * 1.0 / TM_MIN); | 384 | secs * 1.0 / TM_MIN); |
385 | return; | 385 | return; |
386 | } | 386 | } |
387 | if (secs < TM_DAY * 2) { | 387 | if (secs < TM_DAY * 2) { |
388 | htmlf("<span class='age-hours'>%.0f hours</span>", | 388 | htmlf("<span class='age-hours'>%.0f hours</span>", |
389 | secs * 1.0 / TM_HOUR); | 389 | secs * 1.0 / TM_HOUR); |
390 | return; | 390 | return; |
391 | } | 391 | } |
392 | if (secs < TM_WEEK * 2) { | 392 | if (secs < TM_WEEK * 2) { |
393 | htmlf("<span class='age-days'>%.0f days</span>", | 393 | htmlf("<span class='age-days'>%.0f days</span>", |
394 | secs * 1.0 / TM_DAY); | 394 | secs * 1.0 / TM_DAY); |
395 | return; | 395 | return; |
396 | } | 396 | } |
397 | if (secs < TM_MONTH * 2) { | 397 | if (secs < TM_MONTH * 2) { |
398 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 398 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
399 | secs * 1.0 / TM_WEEK); | 399 | secs * 1.0 / TM_WEEK); |
400 | return; | 400 | return; |
401 | } | 401 | } |
402 | if (secs < TM_YEAR * 2) { | 402 | if (secs < TM_YEAR * 2) { |
403 | htmlf("<span class='age-months'>%.0f months</span>", | 403 | htmlf("<span class='age-months'>%.0f months</span>", |
404 | secs * 1.0 / TM_MONTH); | 404 | secs * 1.0 / TM_MONTH); |
405 | return; | 405 | return; |
406 | } | 406 | } |
407 | htmlf("<span class='age-years'>%.0f years</span>", | 407 | htmlf("<span class='age-years'>%.0f years</span>", |
408 | secs * 1.0 / TM_YEAR); | 408 | secs * 1.0 / TM_YEAR); |
409 | } | 409 | } |
410 | 410 | ||
411 | void cgit_print_http_headers(struct cgit_context *ctx) | 411 | void cgit_print_http_headers(struct cgit_context *ctx) |
412 | { | 412 | { |
413 | if (ctx->page.mimetype && ctx->page.charset) | 413 | if (ctx->page.mimetype && ctx->page.charset) |
414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
415 | ctx->page.charset); | 415 | ctx->page.charset); |
416 | else if (ctx->page.mimetype) | 416 | else if (ctx->page.mimetype) |
417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
418 | if (ctx->page.filename) | 418 | if (ctx->page.filename) |
419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
420 | ctx->page.filename); | 420 | ctx->page.filename); |
421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
423 | html("\n"); | 423 | html("\n"); |
424 | } | 424 | } |
425 | 425 | ||
426 | void cgit_print_docstart(struct cgit_context *ctx) | 426 | void cgit_print_docstart(struct cgit_context *ctx) |
427 | { | 427 | { |
428 | html(cgit_doctype); | 428 | html(cgit_doctype); |
429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
430 | html("<head>\n"); | 430 | html("<head>\n"); |
431 | html("<title>"); | 431 | html("<title>"); |
432 | html_txt(ctx->page.title); | 432 | html_txt(ctx->page.title); |
433 | html("</title>\n"); | 433 | html("</title>\n"); |
434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
435 | if (ctx->cfg.robots && *ctx->cfg.robots) | 435 | if (ctx->cfg.robots && *ctx->cfg.robots) |
436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
437 | html("<link rel='stylesheet' type='text/css' href='"); | 437 | html("<link rel='stylesheet' type='text/css' href='"); |
438 | html_attr(ctx->cfg.css); | 438 | html_attr(ctx->cfg.css); |
439 | html("'/>\n"); | 439 | html("'/>\n"); |
440 | if (ctx->cfg.favicon) { | ||
441 | html("<link rel='shortcut icon' href='"); | ||
442 | html_attr(ctx->cfg.favicon); | ||
443 | html("'/>\n"); | ||
444 | } | ||
440 | html("</head>\n"); | 445 | html("</head>\n"); |
441 | html("<body>\n"); | 446 | html("<body>\n"); |
442 | } | 447 | } |
443 | 448 | ||
444 | void cgit_print_docend() | 449 | void cgit_print_docend() |
445 | { | 450 | { |
446 | html("</div>"); | 451 | html("</div>"); |
447 | if (ctx.cfg.footer) | 452 | if (ctx.cfg.footer) |
448 | html_include(ctx.cfg.footer); | 453 | html_include(ctx.cfg.footer); |
449 | else { | 454 | else { |
450 | html("<div class='footer'>generated "); | 455 | html("<div class='footer'>generated "); |
451 | cgit_print_date(time(NULL), FMT_LONGDATE); | 456 | cgit_print_date(time(NULL), FMT_LONGDATE); |
452 | htmlf(" by cgit %s", cgit_version); | 457 | htmlf(" by cgit %s", cgit_version); |
453 | html("</div>\n"); | 458 | html("</div>\n"); |
454 | } | 459 | } |
455 | html("</body>\n</html>\n"); | 460 | html("</body>\n</html>\n"); |
456 | } | 461 | } |
457 | 462 | ||
458 | int print_branch_option(const char *refname, const unsigned char *sha1, | 463 | int print_branch_option(const char *refname, const unsigned char *sha1, |
459 | int flags, void *cb_data) | 464 | int flags, void *cb_data) |
460 | { | 465 | { |
461 | char *name = (char *)refname; | 466 | char *name = (char *)refname; |
462 | html_option(name, name, ctx.qry.head); | 467 | html_option(name, name, ctx.qry.head); |
463 | return 0; | 468 | return 0; |
464 | } | 469 | } |
465 | 470 | ||
466 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 471 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
467 | int flags, void *cb_data) | 472 | int flags, void *cb_data) |
468 | { | 473 | { |
469 | struct tag *tag; | 474 | struct tag *tag; |
470 | struct taginfo *info; | 475 | struct taginfo *info; |
471 | struct object *obj; | 476 | struct object *obj; |
472 | char buf[256], *url; | 477 | char buf[256], *url; |
473 | unsigned char fileid[20]; | 478 | unsigned char fileid[20]; |
474 | int *header = (int *)cb_data; | 479 | int *header = (int *)cb_data; |
475 | 480 | ||
476 | if (prefixcmp(refname, "refs/archives")) | 481 | if (prefixcmp(refname, "refs/archives")) |
477 | return 0; | 482 | return 0; |
478 | strncpy(buf, refname+14, sizeof(buf)); | 483 | strncpy(buf, refname+14, sizeof(buf)); |
479 | obj = parse_object(sha1); | 484 | obj = parse_object(sha1); |
480 | if (!obj) | 485 | if (!obj) |
481 | return 1; | 486 | return 1; |
482 | if (obj->type == OBJ_TAG) { | 487 | if (obj->type == OBJ_TAG) { |
483 | tag = lookup_tag(sha1); | 488 | tag = lookup_tag(sha1); |
484 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 489 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
485 | return 0; | 490 | return 0; |
486 | hashcpy(fileid, tag->tagged->sha1); | 491 | hashcpy(fileid, tag->tagged->sha1); |
487 | } else if (obj->type != OBJ_BLOB) { | 492 | } else if (obj->type != OBJ_BLOB) { |
488 | return 0; | 493 | return 0; |
489 | } else { | 494 | } else { |
490 | hashcpy(fileid, sha1); | 495 | hashcpy(fileid, sha1); |
491 | } | 496 | } |
492 | if (!*header) { | 497 | if (!*header) { |
493 | html("<h1>download</h1>\n"); | 498 | html("<h1>download</h1>\n"); |
494 | *header = 1; | 499 | *header = 1; |
495 | } | 500 | } |
496 | url = cgit_pageurl(ctx.qry.repo, "blob", | 501 | url = cgit_pageurl(ctx.qry.repo, "blob", |
497 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 502 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
498 | buf)); | 503 | buf)); |
499 | html_link_open(url, NULL, "menu"); | 504 | html_link_open(url, NULL, "menu"); |
500 | html_txt(strlpart(buf, 20)); | 505 | html_txt(strlpart(buf, 20)); |
501 | html_link_close(); | 506 | html_link_close(); |
502 | return 0; | 507 | return 0; |
503 | } | 508 | } |
504 | 509 | ||
505 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 510 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
506 | { | 511 | { |
507 | char *url; | 512 | char *url; |
508 | 513 | ||
509 | if (!ctx.cfg.virtual_root) { | 514 | if (!ctx.cfg.virtual_root) { |
510 | url = fmt("%s/%s", ctx.qry.repo, page); | 515 | url = fmt("%s/%s", ctx.qry.repo, page); |
511 | if (ctx.qry.path) | 516 | if (ctx.qry.path) |
512 | url = fmt("%s/%s", url, ctx.qry.path); | 517 | url = fmt("%s/%s", url, ctx.qry.path); |
513 | html_hidden("url", url); | 518 | html_hidden("url", url); |
514 | } | 519 | } |
515 | 520 | ||
516 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 521 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
517 | html_hidden("h", ctx.qry.head); | 522 | html_hidden("h", ctx.qry.head); |
518 | 523 | ||
519 | if (ctx.qry.sha1) | 524 | if (ctx.qry.sha1) |
520 | html_hidden("id", ctx.qry.sha1); | 525 | html_hidden("id", ctx.qry.sha1); |
521 | if (ctx.qry.sha2) | 526 | if (ctx.qry.sha2) |
522 | html_hidden("id2", ctx.qry.sha2); | 527 | html_hidden("id2", ctx.qry.sha2); |
523 | 528 | ||
524 | if (incl_search) { | 529 | if (incl_search) { |
525 | if (ctx.qry.grep) | 530 | if (ctx.qry.grep) |
526 | html_hidden("qt", ctx.qry.grep); | 531 | html_hidden("qt", ctx.qry.grep); |
527 | if (ctx.qry.search) | 532 | if (ctx.qry.search) |
528 | html_hidden("q", ctx.qry.search); | 533 | html_hidden("q", ctx.qry.search); |
529 | } | 534 | } |
530 | } | 535 | } |
531 | 536 | ||
532 | char *hc(struct cgit_cmd *cmd, const char *page) | 537 | char *hc(struct cgit_cmd *cmd, const char *page) |
533 | { | 538 | { |
534 | return (strcmp(cmd->name, page) ? NULL : "active"); | 539 | return (strcmp(cmd->name, page) ? NULL : "active"); |
535 | } | 540 | } |
536 | 541 | ||
537 | void cgit_print_pageheader(struct cgit_context *ctx) | 542 | void cgit_print_pageheader(struct cgit_context *ctx) |
538 | { | 543 | { |
539 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 544 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
540 | 545 | ||
541 | html("<table id='header'>\n"); | 546 | html("<table id='header'>\n"); |
542 | html("<tr>\n"); | 547 | html("<tr>\n"); |
543 | html("<td class='logo' rowspan='2'><a href='"); | 548 | html("<td class='logo' rowspan='2'><a href='"); |
544 | if (ctx->cfg.logo_link) | 549 | if (ctx->cfg.logo_link) |
545 | html_attr(ctx->cfg.logo_link); | 550 | html_attr(ctx->cfg.logo_link); |
546 | else | 551 | else |
547 | html_attr(cgit_rooturl()); | 552 | html_attr(cgit_rooturl()); |
548 | html("'><img src='"); | 553 | html("'><img src='"); |
549 | html_attr(ctx->cfg.logo); | 554 | html_attr(ctx->cfg.logo); |
550 | html("' alt='cgit logo'/></a></td>\n"); | 555 | html("' alt='cgit logo'/></a></td>\n"); |
551 | 556 | ||
552 | html("<td class='main'>"); | 557 | html("<td class='main'>"); |
553 | if (ctx->repo) { | 558 | if (ctx->repo) { |
554 | cgit_index_link("index", NULL, NULL, NULL, 0); | 559 | cgit_index_link("index", NULL, NULL, NULL, 0); |
555 | html(" : "); | 560 | html(" : "); |
556 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), | 561 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), |
557 | ctx->qry.head, NULL, NULL); | 562 | ctx->qry.head, NULL, NULL); |
558 | html("</td><td class='form'>"); | 563 | html("</td><td class='form'>"); |
559 | html("<form method='get' action=''>\n"); | 564 | html("<form method='get' action=''>\n"); |
560 | add_hidden_formfields(0, 1, ctx->qry.page); | 565 | add_hidden_formfields(0, 1, ctx->qry.page); |
561 | html("<select name='h' onchange='this.form.submit();'>\n"); | 566 | html("<select name='h' onchange='this.form.submit();'>\n"); |
562 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 567 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
563 | html("</select> "); | 568 | html("</select> "); |
564 | html("<input type='submit' name='' value='switch'/>"); | 569 | html("<input type='submit' name='' value='switch'/>"); |
565 | html("</form>"); | 570 | html("</form>"); |
566 | } else | 571 | } else |
567 | html_txt(ctx->cfg.root_title); | 572 | html_txt(ctx->cfg.root_title); |