summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-02-27 11:53:27 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-02-27 11:53:27 (UTC)
commit71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (patch) (unidiff)
tree703e8cfe4bc3715833afa824d2f2bd320eb9a89e
parent547a64fbd65de293c290f4e18bbeae958d54aaa7 (diff)
parent9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff)
downloadcgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.zip
cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.gz
cgit-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--ui-shared.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/cgit.c b/cgit.c
index e46c00a..9305d0a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,732 +1,732 @@
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#include "ui-stats.h" 15#include "ui-stats.h"
16#include "scan-tree.h" 16#include "scan-tree.h"
17 17
18const char *cgit_version = CGIT_VERSION; 18const char *cgit_version = CGIT_VERSION;
19 19
20void add_mimetype(const char *name, const char *value) 20void add_mimetype(const char *name, const char *value)
21{ 21{
22 struct string_list_item *item; 22 struct string_list_item *item;
23 23
24 item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); 24 item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
25 item->util = xstrdup(value); 25 item->util = xstrdup(value);
26} 26}
27 27
28struct cgit_filter *new_filter(const char *cmd, int extra_args) 28struct cgit_filter *new_filter(const char *cmd, int extra_args)
29{ 29{
30 struct cgit_filter *f; 30 struct cgit_filter *f;
31 31
32 if (!cmd || !cmd[0]) 32 if (!cmd || !cmd[0])
33 return NULL; 33 return NULL;
34 34
35 f = xmalloc(sizeof(struct cgit_filter)); 35 f = xmalloc(sizeof(struct cgit_filter));
36 f->cmd = xstrdup(cmd); 36 f->cmd = xstrdup(cmd);
37 f->argv = xmalloc((2 + extra_args) * sizeof(char *)); 37 f->argv = xmalloc((2 + extra_args) * sizeof(char *));
38 f->argv[0] = f->cmd; 38 f->argv[0] = f->cmd;
39 f->argv[1] = NULL; 39 f->argv[1] = NULL;
40 return f; 40 return f;
41} 41}
42 42
43static void process_cached_repolist(const char *path); 43static void process_cached_repolist(const char *path);
44 44
45void repo_config(struct cgit_repo *repo, const char *name, const char *value) 45void repo_config(struct cgit_repo *repo, const char *name, const char *value)
46{ 46{
47 if (!strcmp(name, "name")) 47 if (!strcmp(name, "name"))
48 repo->name = xstrdup(value); 48 repo->name = xstrdup(value);
49 else if (!strcmp(name, "clone-url")) 49 else if (!strcmp(name, "clone-url"))
50 repo->clone_url = xstrdup(value); 50 repo->clone_url = xstrdup(value);
51 else if (!strcmp(name, "desc")) 51 else if (!strcmp(name, "desc"))
52 repo->desc = xstrdup(value); 52 repo->desc = xstrdup(value);
53 else if (!strcmp(name, "owner")) 53 else if (!strcmp(name, "owner"))
54 repo->owner = xstrdup(value); 54 repo->owner = xstrdup(value);
55 else if (!strcmp(name, "defbranch")) 55 else if (!strcmp(name, "defbranch"))
56 repo->defbranch = xstrdup(value); 56 repo->defbranch = xstrdup(value);
57 else if (!strcmp(name, "snapshots")) 57 else if (!strcmp(name, "snapshots"))
58 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); 58 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
59 else if (!strcmp(name, "enable-log-filecount")) 59 else if (!strcmp(name, "enable-log-filecount"))
60 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 60 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
61 else if (!strcmp(name, "enable-log-linecount")) 61 else if (!strcmp(name, "enable-log-linecount"))
62 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 62 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
63 else if (!strcmp(name, "enable-remote-branches")) 63 else if (!strcmp(name, "enable-remote-branches"))
64 repo->enable_remote_branches = atoi(value); 64 repo->enable_remote_branches = atoi(value);
65 else if (!strcmp(name, "max-stats")) 65 else if (!strcmp(name, "max-stats"))
66 repo->max_stats = cgit_find_stats_period(value, NULL); 66 repo->max_stats = cgit_find_stats_period(value, NULL);
67 else if (!strcmp(name, "module-link")) 67 else if (!strcmp(name, "module-link"))
68 repo->module_link= xstrdup(value); 68 repo->module_link= xstrdup(value);
69 else if (!strcmp(name, "section")) 69 else if (!strcmp(name, "section"))
70 repo->section = xstrdup(value); 70 repo->section = xstrdup(value);
71 else if (!strcmp(name, "readme") && value != NULL) { 71 else if (!strcmp(name, "readme") && value != NULL) {
72 if (*value == '/') 72 if (*value == '/')
73 repo->readme = xstrdup(value); 73 repo->readme = xstrdup(value);
74 else 74 else
75 repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); 75 repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
76 } else if (ctx.cfg.enable_filter_overrides) { 76 } else if (ctx.cfg.enable_filter_overrides) {
77 if (!strcmp(name, "about-filter")) 77 if (!strcmp(name, "about-filter"))
78 repo->about_filter = new_filter(value, 0); 78 repo->about_filter = new_filter(value, 0);
79 else if (!strcmp(name, "commit-filter")) 79 else if (!strcmp(name, "commit-filter"))
80 repo->commit_filter = new_filter(value, 0); 80 repo->commit_filter = new_filter(value, 0);
81 else if (!strcmp(name, "source-filter")) 81 else if (!strcmp(name, "source-filter"))
82 repo->source_filter = new_filter(value, 1); 82 repo->source_filter = new_filter(value, 1);
83 } 83 }
84} 84}
85 85
86void config_cb(const char *name, const char *value) 86void config_cb(const char *name, const char *value)
87{ 87{
88 if (!strcmp(name, "section") || !strcmp(name, "repo.group")) 88 if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
89 ctx.cfg.section = xstrdup(value); 89 ctx.cfg.section = xstrdup(value);
90 else if (!strcmp(name, "repo.url")) 90 else if (!strcmp(name, "repo.url"))
91 ctx.repo = cgit_add_repo(value); 91 ctx.repo = cgit_add_repo(value);
92 else if (ctx.repo && !strcmp(name, "repo.path")) 92 else if (ctx.repo && !strcmp(name, "repo.path"))
93 ctx.repo->path = trim_end(value, '/'); 93 ctx.repo->path = trim_end(value, '/');
94 else if (ctx.repo && !prefixcmp(name, "repo.")) 94 else if (ctx.repo && !prefixcmp(name, "repo."))
95 repo_config(ctx.repo, name + 5, value); 95 repo_config(ctx.repo, name + 5, value);
96 else if (!strcmp(name, "root-title")) 96 else if (!strcmp(name, "root-title"))
97 ctx.cfg.root_title = xstrdup(value); 97 ctx.cfg.root_title = xstrdup(value);
98 else if (!strcmp(name, "root-desc")) 98 else if (!strcmp(name, "root-desc"))
99 ctx.cfg.root_desc = xstrdup(value); 99 ctx.cfg.root_desc = xstrdup(value);
100 else if (!strcmp(name, "root-readme")) 100 else if (!strcmp(name, "root-readme"))
101 ctx.cfg.root_readme = xstrdup(value); 101 ctx.cfg.root_readme = xstrdup(value);
102 else if (!strcmp(name, "css")) 102 else if (!strcmp(name, "css"))
103 ctx.cfg.css = xstrdup(value); 103 ctx.cfg.css = xstrdup(value);
104 else if (!strcmp(name, "favicon")) 104 else if (!strcmp(name, "favicon"))
105 ctx.cfg.favicon = xstrdup(value); 105 ctx.cfg.favicon = xstrdup(value);
106 else if (!strcmp(name, "footer")) 106 else if (!strcmp(name, "footer"))
107 ctx.cfg.footer = xstrdup(value); 107 ctx.cfg.footer = xstrdup(value);
108 else if (!strcmp(name, "head-include")) 108 else if (!strcmp(name, "head-include"))
109 ctx.cfg.head_include = xstrdup(value); 109 ctx.cfg.head_include = xstrdup(value);
110 else if (!strcmp(name, "header")) 110 else if (!strcmp(name, "header"))
111 ctx.cfg.header = xstrdup(value); 111 ctx.cfg.header = xstrdup(value);
112 else if (!strcmp(name, "logo")) 112 else if (!strcmp(name, "logo"))
113 ctx.cfg.logo = xstrdup(value); 113 ctx.cfg.logo = xstrdup(value);
114 else if (!strcmp(name, "index-header")) 114 else if (!strcmp(name, "index-header"))
115 ctx.cfg.index_header = xstrdup(value); 115 ctx.cfg.index_header = xstrdup(value);
116 else if (!strcmp(name, "index-info")) 116 else if (!strcmp(name, "index-info"))
117 ctx.cfg.index_info = xstrdup(value); 117 ctx.cfg.index_info = xstrdup(value);
118 else if (!strcmp(name, "logo-link")) 118 else if (!strcmp(name, "logo-link"))
119 ctx.cfg.logo_link = xstrdup(value); 119 ctx.cfg.logo_link = xstrdup(value);
120 else if (!strcmp(name, "module-link")) 120 else if (!strcmp(name, "module-link"))
121 ctx.cfg.module_link = xstrdup(value); 121 ctx.cfg.module_link = xstrdup(value);
122 else if (!strcmp(name, "virtual-root")) { 122 else if (!strcmp(name, "virtual-root")) {
123 ctx.cfg.virtual_root = trim_end(value, '/'); 123 ctx.cfg.virtual_root = trim_end(value, '/');
124 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 124 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
125 ctx.cfg.virtual_root = ""; 125 ctx.cfg.virtual_root = "";
126 } else if (!strcmp(name, "nocache")) 126 } else if (!strcmp(name, "nocache"))
127 ctx.cfg.nocache = atoi(value); 127 ctx.cfg.nocache = atoi(value);
128 else if (!strcmp(name, "noplainemail")) 128 else if (!strcmp(name, "noplainemail"))
129 ctx.cfg.noplainemail = atoi(value); 129 ctx.cfg.noplainemail = atoi(value);
130 else if (!strcmp(name, "noheader")) 130 else if (!strcmp(name, "noheader"))
131 ctx.cfg.noheader = atoi(value); 131 ctx.cfg.noheader = atoi(value);
132 else if (!strcmp(name, "snapshots")) 132 else if (!strcmp(name, "snapshots"))
133 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 133 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
134 else if (!strcmp(name, "enable-filter-overrides")) 134 else if (!strcmp(name, "enable-filter-overrides"))
135 ctx.cfg.enable_filter_overrides = atoi(value); 135 ctx.cfg.enable_filter_overrides = atoi(value);
136 else if (!strcmp(name, "enable-index-links")) 136 else if (!strcmp(name, "enable-index-links"))
137 ctx.cfg.enable_index_links = atoi(value); 137 ctx.cfg.enable_index_links = atoi(value);
138 else if (!strcmp(name, "enable-log-filecount")) 138 else if (!strcmp(name, "enable-log-filecount"))
139 ctx.cfg.enable_log_filecount = atoi(value); 139 ctx.cfg.enable_log_filecount = atoi(value);
140 else if (!strcmp(name, "enable-log-linecount")) 140 else if (!strcmp(name, "enable-log-linecount"))
141 ctx.cfg.enable_log_linecount = atoi(value); 141 ctx.cfg.enable_log_linecount = atoi(value);
142 else if (!strcmp(name, "enable-remote-branches")) 142 else if (!strcmp(name, "enable-remote-branches"))
143 ctx.cfg.enable_remote_branches = atoi(value); 143 ctx.cfg.enable_remote_branches = atoi(value);
144 else if (!strcmp(name, "enable-tree-linenumbers")) 144 else if (!strcmp(name, "enable-tree-linenumbers"))
145 ctx.cfg.enable_tree_linenumbers = atoi(value); 145 ctx.cfg.enable_tree_linenumbers = atoi(value);
146 else if (!strcmp(name, "max-stats")) 146 else if (!strcmp(name, "max-stats"))
147 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 147 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
148 else if (!strcmp(name, "cache-size")) 148 else if (!strcmp(name, "cache-size"))
149 ctx.cfg.cache_size = atoi(value); 149 ctx.cfg.cache_size = atoi(value);
150 else if (!strcmp(name, "cache-root")) 150 else if (!strcmp(name, "cache-root"))
151 ctx.cfg.cache_root = xstrdup(value); 151 ctx.cfg.cache_root = xstrdup(value);
152 else if (!strcmp(name, "cache-root-ttl")) 152 else if (!strcmp(name, "cache-root-ttl"))
153 ctx.cfg.cache_root_ttl = atoi(value); 153 ctx.cfg.cache_root_ttl = atoi(value);
154 else if (!strcmp(name, "cache-repo-ttl")) 154 else if (!strcmp(name, "cache-repo-ttl"))
155 ctx.cfg.cache_repo_ttl = atoi(value); 155 ctx.cfg.cache_repo_ttl = atoi(value);
156 else if (!strcmp(name, "cache-scanrc-ttl")) 156 else if (!strcmp(name, "cache-scanrc-ttl"))
157 ctx.cfg.cache_scanrc_ttl = atoi(value); 157 ctx.cfg.cache_scanrc_ttl = atoi(value);
158 else if (!strcmp(name, "cache-static-ttl")) 158 else if (!strcmp(name, "cache-static-ttl"))
159 ctx.cfg.cache_static_ttl = atoi(value); 159 ctx.cfg.cache_static_ttl = atoi(value);
160 else if (!strcmp(name, "cache-dynamic-ttl")) 160 else if (!strcmp(name, "cache-dynamic-ttl"))
161 ctx.cfg.cache_dynamic_ttl = atoi(value); 161 ctx.cfg.cache_dynamic_ttl = atoi(value);
162 else if (!strcmp(name, "about-filter")) 162 else if (!strcmp(name, "about-filter"))
163 ctx.cfg.about_filter = new_filter(value, 0); 163 ctx.cfg.about_filter = new_filter(value, 0);
164 else if (!strcmp(name, "commit-filter")) 164 else if (!strcmp(name, "commit-filter"))
165 ctx.cfg.commit_filter = new_filter(value, 0); 165 ctx.cfg.commit_filter = new_filter(value, 0);
166 else if (!strcmp(name, "embedded")) 166 else if (!strcmp(name, "embedded"))
167 ctx.cfg.embedded = atoi(value); 167 ctx.cfg.embedded = atoi(value);
168 else if (!strcmp(name, "max-message-length")) 168 else if (!strcmp(name, "max-message-length"))
169 ctx.cfg.max_msg_len = atoi(value); 169 ctx.cfg.max_msg_len = atoi(value);
170 else if (!strcmp(name, "max-repodesc-length")) 170 else if (!strcmp(name, "max-repodesc-length"))
171 ctx.cfg.max_repodesc_len = atoi(value); 171 ctx.cfg.max_repodesc_len = atoi(value);
172 else if (!strcmp(name, "max-blob-size")) 172 else if (!strcmp(name, "max-blob-size"))
173 ctx.cfg.max_blob_size = atoi(value); 173 ctx.cfg.max_blob_size = atoi(value);
174 else if (!strcmp(name, "max-repo-count")) 174 else if (!strcmp(name, "max-repo-count"))
175 ctx.cfg.max_repo_count = atoi(value); 175 ctx.cfg.max_repo_count = atoi(value);
176 else if (!strcmp(name, "max-commit-count")) 176 else if (!strcmp(name, "max-commit-count"))
177 ctx.cfg.max_commit_count = atoi(value); 177 ctx.cfg.max_commit_count = atoi(value);
178 else if (!strcmp(name, "scan-path")) 178 else if (!strcmp(name, "scan-path"))
179 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 179 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
180 process_cached_repolist(value); 180 process_cached_repolist(value);
181 else 181 else
182 scan_tree(value, repo_config); 182 scan_tree(value, repo_config);
183 else if (!strcmp(name, "source-filter")) 183 else if (!strcmp(name, "source-filter"))
184 ctx.cfg.source_filter = new_filter(value, 1); 184 ctx.cfg.source_filter = new_filter(value, 1);
185 else if (!strcmp(name, "summary-log")) 185 else if (!strcmp(name, "summary-log"))
186 ctx.cfg.summary_log = atoi(value); 186 ctx.cfg.summary_log = atoi(value);
187 else if (!strcmp(name, "summary-branches")) 187 else if (!strcmp(name, "summary-branches"))
188 ctx.cfg.summary_branches = atoi(value); 188 ctx.cfg.summary_branches = atoi(value);
189 else if (!strcmp(name, "summary-tags")) 189 else if (!strcmp(name, "summary-tags"))
190 ctx.cfg.summary_tags = atoi(value); 190 ctx.cfg.summary_tags = atoi(value);
191 else if (!strcmp(name, "side-by-side-diffs")) 191 else if (!strcmp(name, "side-by-side-diffs"))
192 ctx.cfg.ssdiff = atoi(value); 192 ctx.cfg.ssdiff = atoi(value);
193 else if (!strcmp(name, "agefile")) 193 else if (!strcmp(name, "agefile"))
194 ctx.cfg.agefile = xstrdup(value); 194 ctx.cfg.agefile = xstrdup(value);
195 else if (!strcmp(name, "renamelimit")) 195 else if (!strcmp(name, "renamelimit"))
196 ctx.cfg.renamelimit = atoi(value); 196 ctx.cfg.renamelimit = atoi(value);
197 else if (!strcmp(name, "robots")) 197 else if (!strcmp(name, "robots"))
198 ctx.cfg.robots = xstrdup(value); 198 ctx.cfg.robots = xstrdup(value);
199 else if (!strcmp(name, "clone-prefix")) 199 else if (!strcmp(name, "clone-prefix"))
200 ctx.cfg.clone_prefix = xstrdup(value); 200 ctx.cfg.clone_prefix = xstrdup(value);
201 else if (!strcmp(name, "local-time")) 201 else if (!strcmp(name, "local-time"))
202 ctx.cfg.local_time = atoi(value); 202 ctx.cfg.local_time = atoi(value);
203 else if (!prefixcmp(name, "mimetype.")) 203 else if (!prefixcmp(name, "mimetype."))
204 add_mimetype(name + 9, value); 204 add_mimetype(name + 9, value);
205 else if (!strcmp(name, "include")) 205 else if (!strcmp(name, "include"))
206 parse_configfile(value, config_cb); 206 parse_configfile(value, config_cb);
207} 207}
208 208
209static void querystring_cb(const char *name, const char *value) 209static void querystring_cb(const char *name, const char *value)
210{ 210{
211 if (!value) 211 if (!value)
212 value = ""; 212 value = "";
213 213
214 if (!strcmp(name,"r")) { 214 if (!strcmp(name,"r")) {
215 ctx.qry.repo = xstrdup(value); 215 ctx.qry.repo = xstrdup(value);
216 ctx.repo = cgit_get_repoinfo(value); 216 ctx.repo = cgit_get_repoinfo(value);
217 } else if (!strcmp(name, "p")) { 217 } else if (!strcmp(name, "p")) {
218 ctx.qry.page = xstrdup(value); 218 ctx.qry.page = xstrdup(value);
219 } else if (!strcmp(name, "url")) { 219 } else if (!strcmp(name, "url")) {
220 if (*value == '/') 220 if (*value == '/')
221 value++; 221 value++;
222 ctx.qry.url = xstrdup(value); 222 ctx.qry.url = xstrdup(value);
223 cgit_parse_url(value); 223 cgit_parse_url(value);
224 } else if (!strcmp(name, "qt")) { 224 } else if (!strcmp(name, "qt")) {
225 ctx.qry.grep = xstrdup(value); 225 ctx.qry.grep = xstrdup(value);
226 } else if (!strcmp(name, "q")) { 226 } else if (!strcmp(name, "q")) {
227 ctx.qry.search = xstrdup(value); 227 ctx.qry.search = xstrdup(value);
228 } else if (!strcmp(name, "h")) { 228 } else if (!strcmp(name, "h")) {
229 ctx.qry.head = xstrdup(value); 229 ctx.qry.head = xstrdup(value);
230 ctx.qry.has_symref = 1; 230 ctx.qry.has_symref = 1;
231 } else if (!strcmp(name, "id")) { 231 } else if (!strcmp(name, "id")) {
232 ctx.qry.sha1 = xstrdup(value); 232 ctx.qry.sha1 = xstrdup(value);
233 ctx.qry.has_sha1 = 1; 233 ctx.qry.has_sha1 = 1;
234 } else if (!strcmp(name, "id2")) { 234 } else if (!strcmp(name, "id2")) {
235 ctx.qry.sha2 = xstrdup(value); 235 ctx.qry.sha2 = xstrdup(value);
236 ctx.qry.has_sha1 = 1; 236 ctx.qry.has_sha1 = 1;
237 } else if (!strcmp(name, "ofs")) { 237 } else if (!strcmp(name, "ofs")) {
238 ctx.qry.ofs = atoi(value); 238 ctx.qry.ofs = atoi(value);
239 } else if (!strcmp(name, "path")) { 239 } else if (!strcmp(name, "path")) {
240 ctx.qry.path = trim_end(value, '/'); 240 ctx.qry.path = trim_end(value, '/');
241 } else if (!strcmp(name, "name")) { 241 } else if (!strcmp(name, "name")) {
242 ctx.qry.name = xstrdup(value); 242 ctx.qry.name = xstrdup(value);
243 } else if (!strcmp(name, "mimetype")) { 243 } else if (!strcmp(name, "mimetype")) {
244 ctx.qry.mimetype = xstrdup(value); 244 ctx.qry.mimetype = xstrdup(value);
245 } else if (!strcmp(name, "s")){ 245 } else if (!strcmp(name, "s")){
246 ctx.qry.sort = xstrdup(value); 246 ctx.qry.sort = xstrdup(value);
247 } else if (!strcmp(name, "showmsg")) { 247 } else if (!strcmp(name, "showmsg")) {
248 ctx.qry.showmsg = atoi(value); 248 ctx.qry.showmsg = atoi(value);
249 } else if (!strcmp(name, "period")) { 249 } else if (!strcmp(name, "period")) {
250 ctx.qry.period = xstrdup(value); 250 ctx.qry.period = xstrdup(value);
251 } else if (!strcmp(name, "ss")) { 251 } else if (!strcmp(name, "ss")) {
252 ctx.qry.ssdiff = atoi(value); 252 ctx.qry.ssdiff = atoi(value);
253 } 253 }
254} 254}
255 255
256char *xstrdupn(const char *str) 256char *xstrdupn(const char *str)
257{ 257{
258 return (str ? xstrdup(str) : NULL); 258 return (str ? xstrdup(str) : NULL);
259} 259}
260 260
261static void prepare_context(struct cgit_context *ctx) 261static void prepare_context(struct cgit_context *ctx)
262{ 262{
263 memset(ctx, 0, sizeof(ctx)); 263 memset(ctx, 0, sizeof(*ctx));
264 ctx->cfg.agefile = "info/web/last-modified"; 264 ctx->cfg.agefile = "info/web/last-modified";
265 ctx->cfg.nocache = 0; 265 ctx->cfg.nocache = 0;
266 ctx->cfg.cache_size = 0; 266 ctx->cfg.cache_size = 0;
267 ctx->cfg.cache_dynamic_ttl = 5; 267 ctx->cfg.cache_dynamic_ttl = 5;
268 ctx->cfg.cache_max_create_time = 5; 268 ctx->cfg.cache_max_create_time = 5;
269 ctx->cfg.cache_repo_ttl = 5; 269 ctx->cfg.cache_repo_ttl = 5;
270 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 270 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
271 ctx->cfg.cache_root_ttl = 5; 271 ctx->cfg.cache_root_ttl = 5;
272 ctx->cfg.cache_scanrc_ttl = 15; 272 ctx->cfg.cache_scanrc_ttl = 15;
273 ctx->cfg.cache_static_ttl = -1; 273 ctx->cfg.cache_static_ttl = -1;
274 ctx->cfg.css = "/cgit.css"; 274 ctx->cfg.css = "/cgit.css";
275 ctx->cfg.logo = "/cgit.png"; 275 ctx->cfg.logo = "/cgit.png";
276 ctx->cfg.local_time = 0; 276 ctx->cfg.local_time = 0;
277 ctx->cfg.enable_tree_linenumbers = 1; 277 ctx->cfg.enable_tree_linenumbers = 1;
278 ctx->cfg.max_repo_count = 50; 278 ctx->cfg.max_repo_count = 50;
279 ctx->cfg.max_commit_count = 50; 279 ctx->cfg.max_commit_count = 50;
280 ctx->cfg.max_lock_attempts = 5; 280 ctx->cfg.max_lock_attempts = 5;
281 ctx->cfg.max_msg_len = 80; 281 ctx->cfg.max_msg_len = 80;
282 ctx->cfg.max_repodesc_len = 80; 282 ctx->cfg.max_repodesc_len = 80;
283 ctx->cfg.max_blob_size = 0; 283 ctx->cfg.max_blob_size = 0;
284 ctx->cfg.max_stats = 0; 284 ctx->cfg.max_stats = 0;
285 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 285 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
286 ctx->cfg.renamelimit = -1; 286 ctx->cfg.renamelimit = -1;
287 ctx->cfg.robots = "index, nofollow"; 287 ctx->cfg.robots = "index, nofollow";
288 ctx->cfg.root_title = "Git repository browser"; 288 ctx->cfg.root_title = "Git repository browser";
289 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 289 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
290 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 290 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
291 ctx->cfg.section = ""; 291 ctx->cfg.section = "";
292 ctx->cfg.summary_branches = 10; 292 ctx->cfg.summary_branches = 10;
293 ctx->cfg.summary_log = 10; 293 ctx->cfg.summary_log = 10;
294 ctx->cfg.summary_tags = 10; 294 ctx->cfg.summary_tags = 10;
295 ctx->cfg.ssdiff = 0; 295 ctx->cfg.ssdiff = 0;
296 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); 296 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
297 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); 297 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
298 ctx->env.https = xstrdupn(getenv("HTTPS")); 298 ctx->env.https = xstrdupn(getenv("HTTPS"));
299 ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); 299 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
300 ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); 300 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
301 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); 301 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
302 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); 302 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
303 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); 303 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
304 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); 304 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
305 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); 305 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
306 ctx->page.mimetype = "text/html"; 306 ctx->page.mimetype = "text/html";
307 ctx->page.charset = PAGE_ENCODING; 307 ctx->page.charset = PAGE_ENCODING;
308 ctx->page.filename = NULL; 308 ctx->page.filename = NULL;
309 ctx->page.size = 0; 309 ctx->page.size = 0;
310 ctx->page.modified = time(NULL); 310 ctx->page.modified = time(NULL);
311 ctx->page.expires = ctx->page.modified; 311 ctx->page.expires = ctx->page.modified;
312 ctx->page.etag = NULL; 312 ctx->page.etag = NULL;
313 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 313 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
314 if (ctx->env.script_name) 314 if (ctx->env.script_name)
315 ctx->cfg.script_name = ctx->env.script_name; 315 ctx->cfg.script_name = ctx->env.script_name;
316 if (ctx->env.query_string) 316 if (ctx->env.query_string)
317 ctx->qry.raw = ctx->env.query_string; 317 ctx->qry.raw = ctx->env.query_string;
318 if (!ctx->env.cgit_config) 318 if (!ctx->env.cgit_config)
319 ctx->env.cgit_config = CGIT_CONFIG; 319 ctx->env.cgit_config = CGIT_CONFIG;
320} 320}
321 321
322struct refmatch { 322struct refmatch {
323 char *req_ref; 323 char *req_ref;
324 char *first_ref; 324 char *first_ref;
325 int match; 325 int match;
326}; 326};
327 327
328int find_current_ref(const char *refname, const unsigned char *sha1, 328int find_current_ref(const char *refname, const unsigned char *sha1,
329 int flags, void *cb_data) 329 int flags, void *cb_data)
330{ 330{
331 struct refmatch *info; 331 struct refmatch *info;
332 332
333 info = (struct refmatch *)cb_data; 333 info = (struct refmatch *)cb_data;
334 if (!strcmp(refname, info->req_ref)) 334 if (!strcmp(refname, info->req_ref))
335 info->match = 1; 335 info->match = 1;
336 if (!info->first_ref) 336 if (!info->first_ref)
337 info->first_ref = xstrdup(refname); 337 info->first_ref = xstrdup(refname);
338 return info->match; 338 return info->match;
339} 339}
340 340
341char *find_default_branch(struct cgit_repo *repo) 341char *find_default_branch(struct cgit_repo *repo)
342{ 342{
343 struct refmatch info; 343 struct refmatch info;
344 char *ref; 344 char *ref;
345 345
346 info.req_ref = repo->defbranch; 346 info.req_ref = repo->defbranch;
347 info.first_ref = NULL; 347 info.first_ref = NULL;
348 info.match = 0; 348 info.match = 0;
349 for_each_branch_ref(find_current_ref, &info); 349 for_each_branch_ref(find_current_ref, &info);
350 if (info.match) 350 if (info.match)
351 ref = info.req_ref; 351 ref = info.req_ref;
352 else 352 else
353 ref = info.first_ref; 353 ref = info.first_ref;
354 if (ref) 354 if (ref)
355 ref = xstrdup(ref); 355 ref = xstrdup(ref);
356 return ref; 356 return ref;
357} 357}
358 358
359static int prepare_repo_cmd(struct cgit_context *ctx) 359static int prepare_repo_cmd(struct cgit_context *ctx)
360{ 360{
361 char *tmp; 361 char *tmp;
362 unsigned char sha1[20]; 362 unsigned char sha1[20];
363 int nongit = 0; 363 int nongit = 0;
364 364
365 setenv("GIT_DIR", ctx->repo->path, 1); 365 setenv("GIT_DIR", ctx->repo->path, 1);
366 setup_git_directory_gently(&nongit); 366 setup_git_directory_gently(&nongit);
367 if (nongit) { 367 if (nongit) {
368 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, 368 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
369 "config error"); 369 "config error");
370 tmp = fmt("Not a git repository: '%s'", ctx->repo->path); 370 tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
371 ctx->repo = NULL; 371 ctx->repo = NULL;
372 cgit_print_http_headers(ctx); 372 cgit_print_http_headers(ctx);
373 cgit_print_docstart(ctx); 373 cgit_print_docstart(ctx);
374 cgit_print_pageheader(ctx); 374 cgit_print_pageheader(ctx);
375 cgit_print_error(tmp); 375 cgit_print_error(tmp);
376 cgit_print_docend(); 376 cgit_print_docend();
377 return 1; 377 return 1;
378 } 378 }
379 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); 379 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
380 380
381 if (!ctx->qry.head) { 381 if (!ctx->qry.head) {
382 ctx->qry.nohead = 1; 382 ctx->qry.nohead = 1;
383 ctx->qry.head = find_default_branch(ctx->repo); 383 ctx->qry.head = find_default_branch(ctx->repo);
384 ctx->repo->defbranch = ctx->qry.head; 384 ctx->repo->defbranch = ctx->qry.head;
385 } 385 }
386 386
387 if (!ctx->qry.head) { 387 if (!ctx->qry.head) {
388 cgit_print_http_headers(ctx); 388 cgit_print_http_headers(ctx);
389 cgit_print_docstart(ctx); 389 cgit_print_docstart(ctx);
390 cgit_print_pageheader(ctx); 390 cgit_print_pageheader(ctx);
391 cgit_print_error("Repository seems to be empty"); 391 cgit_print_error("Repository seems to be empty");
392 cgit_print_docend(); 392 cgit_print_docend();
393 return 1; 393 return 1;
394 } 394 }
395 395
396 if (get_sha1(ctx->qry.head, sha1)) { 396 if (get_sha1(ctx->qry.head, sha1)) {
397 tmp = xstrdup(ctx->qry.head); 397 tmp = xstrdup(ctx->qry.head);
398 ctx->qry.head = ctx->repo->defbranch; 398 ctx->qry.head = ctx->repo->defbranch;
399 ctx->page.status = 404; 399 ctx->page.status = 404;
400 ctx->page.statusmsg = "not found"; 400 ctx->page.statusmsg = "not found";
401 cgit_print_http_headers(ctx); 401 cgit_print_http_headers(ctx);
402 cgit_print_docstart(ctx); 402 cgit_print_docstart(ctx);
403 cgit_print_pageheader(ctx); 403 cgit_print_pageheader(ctx);
404 cgit_print_error(fmt("Invalid branch: %s", tmp)); 404 cgit_print_error(fmt("Invalid branch: %s", tmp));
405 cgit_print_docend(); 405 cgit_print_docend();
406 return 1; 406 return 1;
407 } 407 }
408 return 0; 408 return 0;
409} 409}
410 410
411static void process_request(void *cbdata) 411static void process_request(void *cbdata)
412{ 412{
413 struct cgit_context *ctx = cbdata; 413 struct cgit_context *ctx = cbdata;
414 struct cgit_cmd *cmd; 414 struct cgit_cmd *cmd;
415 415
416 cmd = cgit_get_cmd(ctx); 416 cmd = cgit_get_cmd(ctx);
417 if (!cmd) { 417 if (!cmd) {
418 ctx->page.title = "cgit error"; 418 ctx->page.title = "cgit error";
419 cgit_print_http_headers(ctx); 419 cgit_print_http_headers(ctx);
420 cgit_print_docstart(ctx); 420 cgit_print_docstart(ctx);
421 cgit_print_pageheader(ctx); 421 cgit_print_pageheader(ctx);
422 cgit_print_error("Invalid request"); 422 cgit_print_error("Invalid request");
423 cgit_print_docend(); 423 cgit_print_docend();
424 return; 424 return;
425 } 425 }
426 426
427 if (cmd->want_repo && !ctx->repo) { 427 if (cmd->want_repo && !ctx->repo) {
428 cgit_print_http_headers(ctx); 428 cgit_print_http_headers(ctx);
429 cgit_print_docstart(ctx); 429 cgit_print_docstart(ctx);
430 cgit_print_pageheader(ctx); 430 cgit_print_pageheader(ctx);
431 cgit_print_error(fmt("No repository selected")); 431 cgit_print_error(fmt("No repository selected"));
432 cgit_print_docend(); 432 cgit_print_docend();
433 return; 433 return;
434 } 434 }
435 435
436 if (ctx->repo && prepare_repo_cmd(ctx)) 436 if (ctx->repo && prepare_repo_cmd(ctx))
437 return; 437 return;
438 438
439 if (cmd->want_layout) { 439 if (cmd->want_layout) {
440 cgit_print_http_headers(ctx); 440 cgit_print_http_headers(ctx);
441 cgit_print_docstart(ctx); 441 cgit_print_docstart(ctx);
442 cgit_print_pageheader(ctx); 442 cgit_print_pageheader(ctx);
443 } 443 }
444 444
445 cmd->fn(ctx); 445 cmd->fn(ctx);
446 446
447 if (cmd->want_layout) 447 if (cmd->want_layout)
448 cgit_print_docend(); 448 cgit_print_docend();
449} 449}
450 450
451int cmp_repos(const void *a, const void *b) 451int cmp_repos(const void *a, const void *b)
452{ 452{
453 const struct cgit_repo *ra = a, *rb = b; 453 const struct cgit_repo *ra = a, *rb = b;
454 return strcmp(ra->url, rb->url); 454 return strcmp(ra->url, rb->url);
455} 455}
456 456
457char *build_snapshot_setting(int bitmap) 457char *build_snapshot_setting(int bitmap)
458{ 458{
459 const struct cgit_snapshot_format *f; 459 const struct cgit_snapshot_format *f;
460 char *result = xstrdup(""); 460 char *result = xstrdup("");
461 char *tmp; 461 char *tmp;
462 int len; 462 int len;
463 463
464 for (f = cgit_snapshot_formats; f->suffix; f++) { 464 for (f = cgit_snapshot_formats; f->suffix; f++) {
465 if (f->bit & bitmap) { 465 if (f->bit & bitmap) {
466 tmp = result; 466 tmp = result;
467 result = xstrdup(fmt("%s%s ", tmp, f->suffix)); 467 result = xstrdup(fmt("%s%s ", tmp, f->suffix));
468 free(tmp); 468 free(tmp);
469 } 469 }
470 } 470 }
471 len = strlen(result); 471 len = strlen(result);
472 if (len) 472 if (len)
473 result[len - 1] = '\0'; 473 result[len - 1] = '\0';
474 return result; 474 return result;
475} 475}
476 476
477char *get_first_line(char *txt) 477char *get_first_line(char *txt)
478{ 478{
479 char *t = xstrdup(txt); 479 char *t = xstrdup(txt);
480 char *p = strchr(t, '\n'); 480 char *p = strchr(t, '\n');
481 if (p) 481 if (p)
482 *p = '\0'; 482 *p = '\0';
483 return t; 483 return t;
484} 484}
485 485
486void print_repo(FILE *f, struct cgit_repo *repo) 486void print_repo(FILE *f, struct cgit_repo *repo)
487{ 487{
488 fprintf(f, "repo.url=%s\n", repo->url); 488 fprintf(f, "repo.url=%s\n", repo->url);
489 fprintf(f, "repo.name=%s\n", repo->name); 489 fprintf(f, "repo.name=%s\n", repo->name);
490 fprintf(f, "repo.path=%s\n", repo->path); 490 fprintf(f, "repo.path=%s\n", repo->path);
491 if (repo->owner) 491 if (repo->owner)
492 fprintf(f, "repo.owner=%s\n", repo->owner); 492 fprintf(f, "repo.owner=%s\n", repo->owner);
493 if (repo->desc) { 493 if (repo->desc) {
494 char *tmp = get_first_line(repo->desc); 494 char *tmp = get_first_line(repo->desc);
495 fprintf(f, "repo.desc=%s\n", tmp); 495 fprintf(f, "repo.desc=%s\n", tmp);
496 free(tmp); 496 free(tmp);
497 } 497 }
498 if (repo->readme) 498 if (repo->readme)
499 fprintf(f, "repo.readme=%s\n", repo->readme); 499 fprintf(f, "repo.readme=%s\n", repo->readme);
500 if (repo->defbranch) 500 if (repo->defbranch)
501 fprintf(f, "repo.defbranch=%s\n", repo->defbranch); 501 fprintf(f, "repo.defbranch=%s\n", repo->defbranch);
502 if (repo->module_link) 502 if (repo->module_link)
503 fprintf(f, "repo.module-link=%s\n", repo->module_link); 503 fprintf(f, "repo.module-link=%s\n", repo->module_link);
504 if (repo->section) 504 if (repo->section)
505 fprintf(f, "repo.section=%s\n", repo->section); 505 fprintf(f, "repo.section=%s\n", repo->section);
506 if (repo->clone_url) 506 if (repo->clone_url)
507 fprintf(f, "repo.clone-url=%s\n", repo->clone_url); 507 fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
508 fprintf(f, "repo.enable-log-filecount=%d\n", 508 fprintf(f, "repo.enable-log-filecount=%d\n",
509 repo->enable_log_filecount); 509 repo->enable_log_filecount);
510 fprintf(f, "repo.enable-log-linecount=%d\n", 510 fprintf(f, "repo.enable-log-linecount=%d\n",
511 repo->enable_log_linecount); 511 repo->enable_log_linecount);
512 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) 512 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
513 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); 513 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
514 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) 514 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
515 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); 515 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
516 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) 516 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
517 fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); 517 fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
518 if (repo->snapshots != ctx.cfg.snapshots) { 518 if (repo->snapshots != ctx.cfg.snapshots) {
519 char *tmp = build_snapshot_setting(repo->snapshots); 519 char *tmp = build_snapshot_setting(repo->snapshots);
520 fprintf(f, "repo.snapshots=%s\n", tmp); 520 fprintf(f, "repo.snapshots=%s\n", tmp);
521 free(tmp); 521 free(tmp);
522 } 522 }
523 if (repo->max_stats != ctx.cfg.max_stats) 523 if (repo->max_stats != ctx.cfg.max_stats)
524 fprintf(f, "repo.max-stats=%s\n", 524 fprintf(f, "repo.max-stats=%s\n",
525 cgit_find_stats_periodname(repo->max_stats)); 525 cgit_find_stats_periodname(repo->max_stats));
526 fprintf(f, "\n"); 526 fprintf(f, "\n");
527} 527}
528 528
529void print_repolist(FILE *f, struct cgit_repolist *list, int start) 529void print_repolist(FILE *f, struct cgit_repolist *list, int start)
530{ 530{
531 int i; 531 int i;
532 532
533 for(i = start; i < list->count; i++) 533 for(i = start; i < list->count; i++)
534 print_repo(f, &list->repos[i]); 534 print_repo(f, &list->repos[i]);
535} 535}
536 536
537/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' 537/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc'
538 * and return 0 on success. 538 * and return 0 on success.
539 */ 539 */
540static int generate_cached_repolist(const char *path, const char *cached_rc) 540static int generate_cached_repolist(const char *path, const char *cached_rc)
541{ 541{
542 char *locked_rc; 542 char *locked_rc;
543 int idx; 543 int idx;
544 FILE *f; 544 FILE *f;
545 545
546 locked_rc = xstrdup(fmt("%s.lock", cached_rc)); 546 locked_rc = xstrdup(fmt("%s.lock", cached_rc));
547 f = fopen(locked_rc, "wx"); 547 f = fopen(locked_rc, "wx");
548 if (!f) { 548 if (!f) {
549 /* Inform about the error unless the lockfile already existed, 549 /* Inform about the error unless the lockfile already existed,
550 * since that only means we've got concurrent requests. 550 * since that only means we've got concurrent requests.
551 */ 551 */
552 if (errno != EEXIST) 552 if (errno != EEXIST)
553 fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", 553 fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",
554 locked_rc, strerror(errno), errno); 554 locked_rc, strerror(errno), errno);
555 return errno; 555 return errno;
556 } 556 }
557 idx = cgit_repolist.count; 557 idx = cgit_repolist.count;
558 scan_tree(path, repo_config); 558 scan_tree(path, repo_config);
559 print_repolist(f, &cgit_repolist, idx); 559 print_repolist(f, &cgit_repolist, idx);
560 if (rename(locked_rc, cached_rc)) 560 if (rename(locked_rc, cached_rc))
561 fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", 561 fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
562 locked_rc, cached_rc, strerror(errno), errno); 562 locked_rc, cached_rc, strerror(errno), errno);
563 fclose(f); 563 fclose(f);
564 return 0; 564 return 0;
565} 565}
566 566
567static void process_cached_repolist(const char *path) 567static void process_cached_repolist(const char *path)
568{ 568{
569 struct stat st; 569 struct stat st;
570 char *cached_rc; 570 char *cached_rc;
571 time_t age; 571 time_t age;
572 572
573 cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, 573 cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,
574 hash_str(path))); 574 hash_str(path)));
575 575
576 if (stat(cached_rc, &st)) { 576 if (stat(cached_rc, &st)) {
577 /* Nothing is cached, we need to scan without forking. And 577 /* Nothing is cached, we need to scan without forking. And
578 * if we fail to generate a cached repolist, we need to 578 * if we fail to generate a cached repolist, we need to
579 * invoke scan_tree manually. 579 * invoke scan_tree manually.
580 */ 580 */
581 if (generate_cached_repolist(path, cached_rc)) 581 if (generate_cached_repolist(path, cached_rc))
582 scan_tree(path, repo_config); 582 scan_tree(path, repo_config);
583 return; 583 return;
584 } 584 }
585 585
586 parse_configfile(cached_rc, config_cb); 586 parse_configfile(cached_rc, config_cb);
587 587
588 /* If the cached configfile hasn't expired, lets exit now */ 588 /* If the cached configfile hasn't expired, lets exit now */
589 age = time(NULL) - st.st_mtime; 589 age = time(NULL) - st.st_mtime;
590 if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) 590 if (age <= (ctx.cfg.cache_scanrc_ttl * 60))
591 return; 591 return;
592 592
593 /* The cached repolist has been parsed, but it was old. So lets 593 /* The cached repolist has been parsed, but it was old. So lets
594 * rescan the specified path and generate a new cached repolist 594 * rescan the specified path and generate a new cached repolist
595 * in a child-process to avoid latency for the current request. 595 * in a child-process to avoid latency for the current request.
596 */ 596 */
597 if (fork()) 597 if (fork())
598 return; 598 return;
599 599
600 exit(generate_cached_repolist(path, cached_rc)); 600 exit(generate_cached_repolist(path, cached_rc));
601} 601}
602 602
603static void cgit_parse_args(int argc, const char **argv) 603static void cgit_parse_args(int argc, const char **argv)
604{ 604{
605 int i; 605 int i;
606 int scan = 0; 606 int scan = 0;
607 607
608 for (i = 1; i < argc; i++) { 608 for (i = 1; i < argc; i++) {
609 if (!strncmp(argv[i], "--cache=", 8)) { 609 if (!strncmp(argv[i], "--cache=", 8)) {
610 ctx.cfg.cache_root = xstrdup(argv[i]+8); 610 ctx.cfg.cache_root = xstrdup(argv[i]+8);
611 } 611 }
612 if (!strcmp(argv[i], "--nocache")) { 612 if (!strcmp(argv[i], "--nocache")) {
613 ctx.cfg.nocache = 1; 613 ctx.cfg.nocache = 1;
614 } 614 }
615 if (!strcmp(argv[i], "--nohttp")) { 615 if (!strcmp(argv[i], "--nohttp")) {
616 ctx.env.no_http = "1"; 616 ctx.env.no_http = "1";
617 } 617 }
618 if (!strncmp(argv[i], "--query=", 8)) { 618 if (!strncmp(argv[i], "--query=", 8)) {
619 ctx.qry.raw = xstrdup(argv[i]+8); 619 ctx.qry.raw = xstrdup(argv[i]+8);
620 } 620 }
621 if (!strncmp(argv[i], "--repo=", 7)) { 621 if (!strncmp(argv[i], "--repo=", 7)) {
622 ctx.qry.repo = xstrdup(argv[i]+7); 622 ctx.qry.repo = xstrdup(argv[i]+7);
623 } 623 }
624 if (!strncmp(argv[i], "--page=", 7)) { 624 if (!strncmp(argv[i], "--page=", 7)) {
625 ctx.qry.page = xstrdup(argv[i]+7); 625 ctx.qry.page = xstrdup(argv[i]+7);
626 } 626 }
627 if (!strncmp(argv[i], "--head=", 7)) { 627 if (!strncmp(argv[i], "--head=", 7)) {
628 ctx.qry.head = xstrdup(argv[i]+7); 628 ctx.qry.head = xstrdup(argv[i]+7);
629 ctx.qry.has_symref = 1; 629 ctx.qry.has_symref = 1;
630 } 630 }
631 if (!strncmp(argv[i], "--sha1=", 7)) { 631 if (!strncmp(argv[i], "--sha1=", 7)) {
632 ctx.qry.sha1 = xstrdup(argv[i]+7); 632 ctx.qry.sha1 = xstrdup(argv[i]+7);
633 ctx.qry.has_sha1 = 1; 633 ctx.qry.has_sha1 = 1;
634 } 634 }
635 if (!strncmp(argv[i], "--ofs=", 6)) { 635 if (!strncmp(argv[i], "--ofs=", 6)) {
636 ctx.qry.ofs = atoi(argv[i]+6); 636 ctx.qry.ofs = atoi(argv[i]+6);
637 } 637 }
638 if (!strncmp(argv[i], "--scan-tree=", 12) || 638 if (!strncmp(argv[i], "--scan-tree=", 12) ||
639 !strncmp(argv[i], "--scan-path=", 12)) { 639 !strncmp(argv[i], "--scan-path=", 12)) {
640 /* HACK: the global snapshot bitmask defines the 640 /* HACK: the global snapshot bitmask defines the
641 * set of allowed snapshot formats, but the config 641 * set of allowed snapshot formats, but the config
642 * file hasn't been parsed yet so the mask is 642 * file hasn't been parsed yet so the mask is
643 * currently 0. By setting all bits high before 643 * currently 0. By setting all bits high before
644 * scanning we make sure that any in-repo cgitrc 644 * scanning we make sure that any in-repo cgitrc
645 * snapshot setting is respected by scan_tree(). 645 * snapshot setting is respected by scan_tree().
646 * BTW: we assume that there'll never be more than 646 * BTW: we assume that there'll never be more than
647 * 255 different snapshot formats supported by cgit... 647 * 255 different snapshot formats supported by cgit...
648 */ 648 */
649 ctx.cfg.snapshots = 0xFF; 649 ctx.cfg.snapshots = 0xFF;
650 scan++; 650 scan++;
651 scan_tree(argv[i] + 12, repo_config); 651 scan_tree(argv[i] + 12, repo_config);
652 } 652 }
653 } 653 }
654 if (scan) { 654 if (scan) {
655 qsort(cgit_repolist.repos, cgit_repolist.count, 655 qsort(cgit_repolist.repos, cgit_repolist.count,
656 sizeof(struct cgit_repo), cmp_repos); 656 sizeof(struct cgit_repo), cmp_repos);
657 print_repolist(stdout, &cgit_repolist, 0); 657 print_repolist(stdout, &cgit_repolist, 0);
658 exit(0); 658 exit(0);
659 } 659 }
660} 660}
661 661
662static int calc_ttl() 662static int calc_ttl()
663{ 663{
664 if (!ctx.repo) 664 if (!ctx.repo)
665 return ctx.cfg.cache_root_ttl; 665 return ctx.cfg.cache_root_ttl;
666 666
667 if (!ctx.qry.page) 667 if (!ctx.qry.page)
668 return ctx.cfg.cache_repo_ttl; 668 return ctx.cfg.cache_repo_ttl;
669 669
670 if (ctx.qry.has_symref) 670 if (ctx.qry.has_symref)
671 return ctx.cfg.cache_dynamic_ttl; 671 return ctx.cfg.cache_dynamic_ttl;
672 672
673 if (ctx.qry.has_sha1) 673 if (ctx.qry.has_sha1)
674 return ctx.cfg.cache_static_ttl; 674 return ctx.cfg.cache_static_ttl;
675 675
676 return ctx.cfg.cache_repo_ttl; 676 return ctx.cfg.cache_repo_ttl;
677} 677}
678 678
679int main(int argc, const char **argv) 679int main(int argc, const char **argv)
680{ 680{
681 const char *path; 681 const char *path;
682 char *qry; 682 char *qry;
683 int err, ttl; 683 int err, ttl;
684 684
685 prepare_context(&ctx); 685 prepare_context(&ctx);
686 cgit_repolist.length = 0; 686 cgit_repolist.length = 0;
687 cgit_repolist.count = 0; 687 cgit_repolist.count = 0;
688 cgit_repolist.repos = NULL; 688 cgit_repolist.repos = NULL;
689 689
690 cgit_parse_args(argc, argv); 690 cgit_parse_args(argc, argv);
691 parse_configfile(ctx.env.cgit_config, config_cb); 691 parse_configfile(ctx.env.cgit_config, config_cb);
692 ctx.repo = NULL; 692 ctx.repo = NULL;
693 http_parse_querystring(ctx.qry.raw, querystring_cb); 693 http_parse_querystring(ctx.qry.raw, querystring_cb);
694 694
695 /* If virtual-root isn't specified in cgitrc, lets pretend 695 /* If virtual-root isn't specified in cgitrc, lets pretend
696 * that virtual-root equals SCRIPT_NAME. 696 * that virtual-root equals SCRIPT_NAME.
697 */ 697 */
698 if (!ctx.cfg.virtual_root) 698 if (!ctx.cfg.virtual_root)
699 ctx.cfg.virtual_root = ctx.cfg.script_name; 699 ctx.cfg.virtual_root = ctx.cfg.script_name;
700 700
701 /* If no url parameter is specified on the querystring, lets 701 /* If no url parameter is specified on the querystring, lets
702 * use PATH_INFO as url. This allows cgit to work with virtual 702 * use PATH_INFO as url. This allows cgit to work with virtual
703 * urls without the need for rewriterules in the webserver (as 703 * urls without the need for rewriterules in the webserver (as
704 * long as PATH_INFO is included in the cache lookup key). 704 * long as PATH_INFO is included in the cache lookup key).
705 */ 705 */
706 path = ctx.env.path_info; 706 path = ctx.env.path_info;
707 if (!ctx.qry.url && path) { 707 if (!ctx.qry.url && path) {
708 if (path[0] == '/') 708 if (path[0] == '/')
709 path++; 709 path++;
710 ctx.qry.url = xstrdup(path); 710 ctx.qry.url = xstrdup(path);
711 if (ctx.qry.raw) { 711 if (ctx.qry.raw) {
712 qry = ctx.qry.raw; 712 qry = ctx.qry.raw;
713 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 713 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
714 free(qry); 714 free(qry);
715 } else 715 } else
716 ctx.qry.raw = xstrdup(ctx.qry.url); 716 ctx.qry.raw = xstrdup(ctx.qry.url);
717 cgit_parse_url(ctx.qry.url); 717 cgit_parse_url(ctx.qry.url);
718 } 718 }
719 719
720 ttl = calc_ttl(); 720 ttl = calc_ttl();
721 ctx.page.expires += ttl*60; 721 ctx.page.expires += ttl*60;
722 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) 722 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
723 ctx.cfg.nocache = 1; 723 ctx.cfg.nocache = 1;
724 if (ctx.cfg.nocache) 724 if (ctx.cfg.nocache)
725 ctx.cfg.cache_size = 0; 725 ctx.cfg.cache_size = 0;
726 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 726 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
727 ctx.qry.raw, ttl, process_request, &ctx); 727 ctx.qry.raw, ttl, process_request, &ctx);
728 if (err) 728 if (err)
729 cgit_print_error(fmt("Error processing page: %s (%d)", 729 cgit_print_error(fmt("Error processing page: %s (%d)",
730 strerror(err), err)); 730 strerror(err), err));
731 return err; 731 return err;
732} 732}
diff --git a/ui-shared.c b/ui-shared.c
index 08ea003..8827fff 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,800 +1,800 @@
1/* ui-shared.c: common web output functions 1/* ui-shared.c: common web output functions
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 "cmd.h" 10#include "cmd.h"
11#include "html.h" 11#include "html.h"
12 12
13const char cgit_doctype[] = 13const char cgit_doctype[] =
14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17static char *http_date(time_t t) 17static char *http_date(time_t t)
18{ 18{
19 static char day[][4] = 19 static char day[][4] =
20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
21 static char month[][4] = 21 static char month[][4] =
22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
23 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
24 struct tm *tm = gmtime(&t); 24 struct tm *tm = gmtime(&t);
25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
27 tm->tm_hour, tm->tm_min, tm->tm_sec); 27 tm->tm_hour, tm->tm_min, tm->tm_sec);
28} 28}
29 29
30void cgit_print_error(char *msg) 30void cgit_print_error(char *msg)
31{ 31{
32 html("<div class='error'>"); 32 html("<div class='error'>");
33 html_txt(msg); 33 html_txt(msg);
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_httpscheme() 37char *cgit_httpscheme()
38{ 38{
39 if (ctx.env.https && !strcmp(ctx.env.https, "on")) 39 if (ctx.env.https && !strcmp(ctx.env.https, "on"))
40 return "https://"; 40 return "https://";
41 else 41 else
42 return "http://"; 42 return "http://";
43} 43}
44 44
45char *cgit_hosturl() 45char *cgit_hosturl()
46{ 46{
47 if (ctx.env.http_host) 47 if (ctx.env.http_host)
48 return ctx.env.http_host; 48 return ctx.env.http_host;
49 if (!ctx.env.server_name) 49 if (!ctx.env.server_name)
50 return NULL; 50 return NULL;
51 if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) 51 if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
52 return ctx.env.server_name; 52 return ctx.env.server_name;
53 return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); 53 return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
54} 54}
55 55
56char *cgit_rooturl() 56char *cgit_rooturl()
57{ 57{
58 if (ctx.cfg.virtual_root) 58 if (ctx.cfg.virtual_root)
59 return fmt("%s/", ctx.cfg.virtual_root); 59 return fmt("%s/", ctx.cfg.virtual_root);
60 else 60 else
61 return ctx.cfg.script_name; 61 return ctx.cfg.script_name;
62} 62}
63 63
64char *cgit_repourl(const char *reponame) 64char *cgit_repourl(const char *reponame)
65{ 65{
66 if (ctx.cfg.virtual_root) { 66 if (ctx.cfg.virtual_root) {
67 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 67 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
68 } else { 68 } else {
69 return fmt("?r=%s", reponame); 69 return fmt("?r=%s", reponame);
70 } 70 }
71} 71}
72 72
73char *cgit_fileurl(const char *reponame, const char *pagename, 73char *cgit_fileurl(const char *reponame, const char *pagename,
74 const char *filename, const char *query) 74 const char *filename, const char *query)
75{ 75{
76 char *tmp; 76 char *tmp;
77 char *delim; 77 char *delim;
78 78
79 if (ctx.cfg.virtual_root) { 79 if (ctx.cfg.virtual_root) {
80 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, 80 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
81 pagename, (filename ? filename:"")); 81 pagename, (filename ? filename:""));
82 delim = "?"; 82 delim = "?";
83 } else { 83 } else {
84 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 84 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
85 (filename ? filename : "")); 85 (filename ? filename : ""));
86 delim = "&"; 86 delim = "&";
87 } 87 }
88 if (query) 88 if (query)
89 tmp = fmt("%s%s%s", tmp, delim, query); 89 tmp = fmt("%s%s%s", tmp, delim, query);
90 return tmp; 90 return tmp;
91} 91}
92 92
93char *cgit_pageurl(const char *reponame, const char *pagename, 93char *cgit_pageurl(const char *reponame, const char *pagename,
94 const char *query) 94 const char *query)
95{ 95{
96 return cgit_fileurl(reponame,pagename,0,query); 96 return cgit_fileurl(reponame,pagename,0,query);
97} 97}
98 98
99const char *cgit_repobasename(const char *reponame) 99const char *cgit_repobasename(const char *reponame)
100{ 100{
101 /* I assume we don't need to store more than one repo basename */ 101 /* I assume we don't need to store more than one repo basename */
102 static char rvbuf[1024]; 102 static char rvbuf[1024];
103 int p; 103 int p;
104 const char *rv; 104 const char *rv;
105 strncpy(rvbuf,reponame,sizeof(rvbuf)); 105 strncpy(rvbuf,reponame,sizeof(rvbuf));
106 if(rvbuf[sizeof(rvbuf)-1]) 106 if(rvbuf[sizeof(rvbuf)-1])
107 die("cgit_repobasename: truncated repository name '%s'", reponame); 107 die("cgit_repobasename: truncated repository name '%s'", reponame);
108 p = strlen(rvbuf)-1; 108 p = strlen(rvbuf)-1;
109 /* strip trailing slashes */ 109 /* strip trailing slashes */
110 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 110 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
111 /* strip trailing .git */ 111 /* strip trailing .git */
112 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 112 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
113 p -= 3; rvbuf[p--] = 0; 113 p -= 3; rvbuf[p--] = 0;
114 } 114 }
115 /* strip more trailing slashes if any */ 115 /* strip more trailing slashes if any */
116 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 116 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
117 /* find last slash in the remaining string */ 117 /* find last slash in the remaining string */
118 rv = strrchr(rvbuf,'/'); 118 rv = strrchr(rvbuf,'/');
119 if(rv) 119 if(rv)
120 return ++rv; 120 return ++rv;
121 return rvbuf; 121 return rvbuf;
122} 122}
123 123
124char *cgit_currurl() 124char *cgit_currurl()
125{ 125{
126 if (!ctx.cfg.virtual_root) 126 if (!ctx.cfg.virtual_root)
127 return ctx.cfg.script_name; 127 return ctx.cfg.script_name;
128 else if (ctx.qry.page) 128 else if (ctx.qry.page)
129 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 129 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
130 else if (ctx.qry.repo) 130 else if (ctx.qry.repo)
131 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 131 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
132 else 132 else
133 return fmt("%s/", ctx.cfg.virtual_root); 133 return fmt("%s/", ctx.cfg.virtual_root);
134} 134}
135 135
136static void site_url(char *page, char *search, int ofs) 136static void site_url(char *page, char *search, int ofs)
137{ 137{
138 char *delim = "?"; 138 char *delim = "?";
139 139
140 if (ctx.cfg.virtual_root) { 140 if (ctx.cfg.virtual_root) {
141 html_attr(ctx.cfg.virtual_root); 141 html_attr(ctx.cfg.virtual_root);
142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
143 html("/"); 143 html("/");
144 } else 144 } else
145 html(ctx.cfg.script_name); 145 html(ctx.cfg.script_name);
146 146
147 if (page) { 147 if (page) {
148 htmlf("?p=%s", page); 148 htmlf("?p=%s", page);
149 delim = "&"; 149 delim = "&";
150 } 150 }
151 if (search) { 151 if (search) {
152 html(delim); 152 html(delim);
153 html("q="); 153 html("q=");
154 html_attr(search); 154 html_attr(search);
155 delim = "&"; 155 delim = "&";
156 } 156 }
157 if (ofs) { 157 if (ofs) {
158 html(delim); 158 html(delim);
159 htmlf("ofs=%d", ofs); 159 htmlf("ofs=%d", ofs);
160 } 160 }
161} 161}
162 162
163static void site_link(char *page, char *name, char *title, char *class, 163static void site_link(char *page, char *name, char *title, char *class,
164 char *search, int ofs) 164 char *search, int ofs)
165{ 165{
166 html("<a"); 166 html("<a");
167 if (title) { 167 if (title) {
168 html(" title='"); 168 html(" title='");
169 html_attr(title); 169 html_attr(title);
170 html("'"); 170 html("'");
171 } 171 }
172 if (class) { 172 if (class) {
173 html(" class='"); 173 html(" class='");
174 html_attr(class); 174 html_attr(class);
175 html("'"); 175 html("'");
176 } 176 }
177 html(" href='"); 177 html(" href='");
178 site_url(page, search, ofs); 178 site_url(page, search, ofs);
179 html("'>"); 179 html("'>");
180 html_txt(name); 180 html_txt(name);
181 html("</a>"); 181 html("</a>");
182} 182}
183 183
184void cgit_index_link(char *name, char *title, char *class, char *pattern, 184void cgit_index_link(char *name, char *title, char *class, char *pattern,
185 int ofs) 185 int ofs)
186{ 186{
187 site_link(NULL, name, title, class, pattern, ofs); 187 site_link(NULL, name, title, class, pattern, ofs);
188} 188}
189 189
190static char *repolink(char *title, char *class, char *page, char *head, 190static char *repolink(char *title, char *class, char *page, char *head,
191 char *path) 191 char *path)
192{ 192{
193 char *delim = "?"; 193 char *delim = "?";
194 194
195 html("<a"); 195 html("<a");
196 if (title) { 196 if (title) {
197 html(" title='"); 197 html(" title='");
198 html_attr(title); 198 html_attr(title);
199 html("'"); 199 html("'");
200 } 200 }
201 if (class) { 201 if (class) {
202 html(" class='"); 202 html(" class='");
203 html_attr(class); 203 html_attr(class);
204 html("'"); 204 html("'");
205 } 205 }
206 html(" href='"); 206 html(" href='");
207 if (ctx.cfg.virtual_root) { 207 if (ctx.cfg.virtual_root) {
208 html_url_path(ctx.cfg.virtual_root); 208 html_url_path(ctx.cfg.virtual_root);
209 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 209 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
210 html("/"); 210 html("/");
211 html_url_path(ctx.repo->url); 211 html_url_path(ctx.repo->url);
212 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 212 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
213 html("/"); 213 html("/");
214 if (page) { 214 if (page) {
215 html_url_path(page); 215 html_url_path(page);
216 html("/"); 216 html("/");
217 if (path) 217 if (path)
218 html_url_path(path); 218 html_url_path(path);
219 } 219 }
220 } else { 220 } else {
221 html(ctx.cfg.script_name); 221 html(ctx.cfg.script_name);
222 html("?url="); 222 html("?url=");
223 html_url_arg(ctx.repo->url); 223 html_url_arg(ctx.repo->url);
224 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 224 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
225 html("/"); 225 html("/");
226 if (page) { 226 if (page) {
227 html_url_arg(page); 227 html_url_arg(page);
228 html("/"); 228 html("/");
229 if (path) 229 if (path)
230 html_url_arg(path); 230 html_url_arg(path);
231 } 231 }
232 delim = "&amp;"; 232 delim = "&amp;";
233 } 233 }
234 if (head && strcmp(head, ctx.repo->defbranch)) { 234 if (head && strcmp(head, ctx.repo->defbranch)) {
235 html(delim); 235 html(delim);
236 html("h="); 236 html("h=");
237 html_url_arg(head); 237 html_url_arg(head);
238 delim = "&amp;"; 238 delim = "&amp;";
239 } 239 }
240 return fmt("%s", delim); 240 return fmt("%s", delim);
241} 241}
242 242
243static void reporevlink(char *page, char *name, char *title, char *class, 243static void reporevlink(char *page, char *name, char *title, char *class,
244 char *head, char *rev, char *path) 244 char *head, char *rev, char *path)
245{ 245{
246 char *delim; 246 char *delim;
247 247
248 delim = repolink(title, class, page, head, path); 248 delim = repolink(title, class, page, head, path);
249 if (rev && strcmp(rev, ctx.qry.head)) { 249 if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
250 html(delim); 250 html(delim);
251 html("id="); 251 html("id=");
252 html_url_arg(rev); 252 html_url_arg(rev);
253 } 253 }
254 html("'>"); 254 html("'>");
255 html_txt(name); 255 html_txt(name);
256 html("</a>"); 256 html("</a>");
257} 257}
258 258
259void cgit_summary_link(char *name, char *title, char *class, char *head) 259void cgit_summary_link(char *name, char *title, char *class, char *head)
260{ 260{
261 reporevlink(NULL, name, title, class, head, NULL, NULL); 261 reporevlink(NULL, name, title, class, head, NULL, NULL);
262} 262}
263 263
264void cgit_tag_link(char *name, char *title, char *class, char *head, 264void cgit_tag_link(char *name, char *title, char *class, char *head,
265 char *rev) 265 char *rev)
266{ 266{
267 reporevlink("tag", name, title, class, head, rev, NULL); 267 reporevlink("tag", name, title, class, head, rev, NULL);
268} 268}
269 269
270void cgit_tree_link(char *name, char *title, char *class, char *head, 270void cgit_tree_link(char *name, char *title, char *class, char *head,
271 char *rev, char *path) 271 char *rev, char *path)
272{ 272{
273 reporevlink("tree", name, title, class, head, rev, path); 273 reporevlink("tree", name, title, class, head, rev, path);
274} 274}
275 275
276void cgit_plain_link(char *name, char *title, char *class, char *head, 276void cgit_plain_link(char *name, char *title, char *class, char *head,
277 char *rev, char *path) 277 char *rev, char *path)
278{ 278{
279 reporevlink("plain", name, title, class, head, rev, path); 279 reporevlink("plain", name, title, class, head, rev, path);
280} 280}
281 281
282void cgit_log_link(char *name, char *title, char *class, char *head, 282void cgit_log_link(char *name, char *title, char *class, char *head,
283 char *rev, char *path, int ofs, char *grep, char *pattern, 283 char *rev, char *path, int ofs, char *grep, char *pattern,
284 int showmsg) 284 int showmsg)
285{ 285{
286 char *delim; 286 char *delim;
287 287
288 delim = repolink(title, class, "log", head, path); 288 delim = repolink(title, class, "log", head, path);
289 if (rev && strcmp(rev, ctx.qry.head)) { 289 if (rev && strcmp(rev, ctx.qry.head)) {
290 html(delim); 290 html(delim);
291 html("id="); 291 html("id=");
292 html_url_arg(rev); 292 html_url_arg(rev);
293 delim = "&"; 293 delim = "&";
294 } 294 }
295 if (grep && pattern) { 295 if (grep && pattern) {
296 html(delim); 296 html(delim);
297 html("qt="); 297 html("qt=");
298 html_url_arg(grep); 298 html_url_arg(grep);
299 delim = "&"; 299 delim = "&";
300 html(delim); 300 html(delim);
301 html("q="); 301 html("q=");
302 html_url_arg(pattern); 302 html_url_arg(pattern);
303 } 303 }
304 if (ofs > 0) { 304 if (ofs > 0) {
305 html(delim); 305 html(delim);
306 html("ofs="); 306 html("ofs=");
307 htmlf("%d", ofs); 307 htmlf("%d", ofs);
308 delim = "&"; 308 delim = "&";
309 } 309 }
310 if (showmsg) { 310 if (showmsg) {
311 html(delim); 311 html(delim);
312 html("showmsg=1"); 312 html("showmsg=1");
313 } 313 }
314 html("'>"); 314 html("'>");
315 html_txt(name); 315 html_txt(name);
316 html("</a>"); 316 html("</a>");
317} 317}
318 318
319void cgit_commit_link(char *name, char *title, char *class, char *head, 319void cgit_commit_link(char *name, char *title, char *class, char *head,
320 char *rev, int toggle_ssdiff) 320 char *rev, int toggle_ssdiff)
321{ 321{
322 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 322 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
323 name[ctx.cfg.max_msg_len] = '\0'; 323 name[ctx.cfg.max_msg_len] = '\0';
324 name[ctx.cfg.max_msg_len - 1] = '.'; 324 name[ctx.cfg.max_msg_len - 1] = '.';
325 name[ctx.cfg.max_msg_len - 2] = '.'; 325 name[ctx.cfg.max_msg_len - 2] = '.';
326 name[ctx.cfg.max_msg_len - 3] = '.'; 326 name[ctx.cfg.max_msg_len - 3] = '.';
327 } 327 }
328 328
329 char *delim; 329 char *delim;
330 330
331 delim = repolink(title, class, "commit", head, NULL); 331 delim = repolink(title, class, "commit", head, NULL);
332 if (rev && strcmp(rev, ctx.qry.head)) { 332 if (rev && strcmp(rev, ctx.qry.head)) {
333 html(delim); 333 html(delim);
334 html("id="); 334 html("id=");
335 html_url_arg(rev); 335 html_url_arg(rev);
336 delim = "&amp;"; 336 delim = "&amp;";
337 } 337 }
338 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { 338 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
339 html(delim); 339 html(delim);
340 html("ss=1"); 340 html("ss=1");
341 } 341 }
342 html("'>"); 342 html("'>");
343 html_txt(name); 343 html_txt(name);
344 html("</a>"); 344 html("</a>");
345} 345}
346 346
347void cgit_refs_link(char *name, char *title, char *class, char *head, 347void cgit_refs_link(char *name, char *title, char *class, char *head,
348 char *rev, char *path) 348 char *rev, char *path)
349{ 349{
350 reporevlink("refs", name, title, class, head, rev, path); 350 reporevlink("refs", name, title, class, head, rev, path);
351} 351}
352 352
353void cgit_snapshot_link(char *name, char *title, char *class, char *head, 353void cgit_snapshot_link(char *name, char *title, char *class, char *head,
354 char *rev, char *archivename) 354 char *rev, char *archivename)
355{ 355{
356 reporevlink("snapshot", name, title, class, head, rev, archivename); 356 reporevlink("snapshot", name, title, class, head, rev, archivename);
357} 357}
358 358
359void cgit_diff_link(char *name, char *title, char *class, char *head, 359void cgit_diff_link(char *name, char *title, char *class, char *head,
360 char *new_rev, char *old_rev, char *path, 360 char *new_rev, char *old_rev, char *path,
361 int toggle_ssdiff) 361 int toggle_ssdiff)
362{ 362{
363 char *delim; 363 char *delim;
364 364
365 delim = repolink(title, class, "diff", head, path); 365 delim = repolink(title, class, "diff", head, path);
366 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 366 if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
367 html(delim); 367 html(delim);
368 html("id="); 368 html("id=");
369 html_url_arg(new_rev); 369 html_url_arg(new_rev);
370 delim = "&amp;"; 370 delim = "&amp;";
371 } 371 }
372 if (old_rev) { 372 if (old_rev) {
373 html(delim); 373 html(delim);
374 html("id2="); 374 html("id2=");
375 html_url_arg(old_rev); 375 html_url_arg(old_rev);
376 delim = "&amp;"; 376 delim = "&amp;";
377 } 377 }
378 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { 378 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
379 html(delim); 379 html(delim);
380 html("ss=1"); 380 html("ss=1");
381 } 381 }
382 html("'>"); 382 html("'>");
383 html_txt(name); 383 html_txt(name);
384 html("</a>"); 384 html("</a>");
385} 385}
386 386
387void cgit_patch_link(char *name, char *title, char *class, char *head, 387void cgit_patch_link(char *name, char *title, char *class, char *head,
388 char *rev) 388 char *rev)
389{ 389{
390 reporevlink("patch", name, title, class, head, rev, NULL); 390 reporevlink("patch", name, title, class, head, rev, NULL);
391} 391}
392 392
393void cgit_stats_link(char *name, char *title, char *class, char *head, 393void cgit_stats_link(char *name, char *title, char *class, char *head,
394 char *path) 394 char *path)
395{ 395{
396 reporevlink("stats", name, title, class, head, NULL, path); 396 reporevlink("stats", name, title, class, head, NULL, path);
397} 397}
398 398
399void cgit_object_link(struct object *obj) 399void cgit_object_link(struct object *obj)
400{ 400{
401 char *page, *shortrev, *fullrev, *name; 401 char *page, *shortrev, *fullrev, *name;
402 402
403 fullrev = sha1_to_hex(obj->sha1); 403 fullrev = sha1_to_hex(obj->sha1);
404 shortrev = xstrdup(fullrev); 404 shortrev = xstrdup(fullrev);
405 shortrev[10] = '\0'; 405 shortrev[10] = '\0';
406 if (obj->type == OBJ_COMMIT) { 406 if (obj->type == OBJ_COMMIT) {
407 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, 407 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
408 ctx.qry.head, fullrev, 0); 408 ctx.qry.head, fullrev, 0);
409 return; 409 return;
410 } else if (obj->type == OBJ_TREE) 410 } else if (obj->type == OBJ_TREE)
411 page = "tree"; 411 page = "tree";
412 else if (obj->type == OBJ_TAG) 412 else if (obj->type == OBJ_TAG)
413 page = "tag"; 413 page = "tag";
414 else 414 else
415 page = "blob"; 415 page = "blob";
416 name = fmt("%s %s...", typename(obj->type), shortrev); 416 name = fmt("%s %s...", typename(obj->type), shortrev);
417 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); 417 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
418} 418}
419 419
420void cgit_print_date(time_t secs, char *format, int local_time) 420void cgit_print_date(time_t secs, char *format, int local_time)
421{ 421{
422 char buf[64]; 422 char buf[64];
423 struct tm *time; 423 struct tm *time;
424 424
425 if (!secs) 425 if (!secs)
426 return; 426 return;
427 if(local_time) 427 if(local_time)
428 time = localtime(&secs); 428 time = localtime(&secs);
429 else 429 else
430 time = gmtime(&secs); 430 time = gmtime(&secs);
431 strftime(buf, sizeof(buf)-1, format, time); 431 strftime(buf, sizeof(buf)-1, format, time);
432 html_txt(buf); 432 html_txt(buf);
433} 433}
434 434
435void cgit_print_age(time_t t, time_t max_relative, char *format) 435void cgit_print_age(time_t t, time_t max_relative, char *format)
436{ 436{
437 time_t now, secs; 437 time_t now, secs;
438 438
439 if (!t) 439 if (!t)
440 return; 440 return;
441 time(&now); 441 time(&now);
442 secs = now - t; 442 secs = now - t;
443 443
444 if (secs > max_relative && max_relative >= 0) { 444 if (secs > max_relative && max_relative >= 0) {
445 cgit_print_date(t, format, ctx.cfg.local_time); 445 cgit_print_date(t, format, ctx.cfg.local_time);
446 return; 446 return;
447 } 447 }
448 448
449 if (secs < TM_HOUR * 2) { 449 if (secs < TM_HOUR * 2) {
450 htmlf("<span class='age-mins'>%.0f min.</span>", 450 htmlf("<span class='age-mins'>%.0f min.</span>",
451 secs * 1.0 / TM_MIN); 451 secs * 1.0 / TM_MIN);
452 return; 452 return;
453 } 453 }
454 if (secs < TM_DAY * 2) { 454 if (secs < TM_DAY * 2) {
455 htmlf("<span class='age-hours'>%.0f hours</span>", 455 htmlf("<span class='age-hours'>%.0f hours</span>",
456 secs * 1.0 / TM_HOUR); 456 secs * 1.0 / TM_HOUR);
457 return; 457 return;
458 } 458 }
459 if (secs < TM_WEEK * 2) { 459 if (secs < TM_WEEK * 2) {
460 htmlf("<span class='age-days'>%.0f days</span>", 460 htmlf("<span class='age-days'>%.0f days</span>",
461 secs * 1.0 / TM_DAY); 461 secs * 1.0 / TM_DAY);
462 return; 462 return;
463 } 463 }
464 if (secs < TM_MONTH * 2) { 464 if (secs < TM_MONTH * 2) {
465 htmlf("<span class='age-weeks'>%.0f weeks</span>", 465 htmlf("<span class='age-weeks'>%.0f weeks</span>",
466 secs * 1.0 / TM_WEEK); 466 secs * 1.0 / TM_WEEK);
467 return; 467 return;
468 } 468 }
469 if (secs < TM_YEAR * 2) { 469 if (secs < TM_YEAR * 2) {
470 htmlf("<span class='age-months'>%.0f months</span>", 470 htmlf("<span class='age-months'>%.0f months</span>",
471 secs * 1.0 / TM_MONTH); 471 secs * 1.0 / TM_MONTH);
472 return; 472 return;
473 } 473 }
474 htmlf("<span class='age-years'>%.0f years</span>", 474 htmlf("<span class='age-years'>%.0f years</span>",
475 secs * 1.0 / TM_YEAR); 475 secs * 1.0 / TM_YEAR);
476} 476}
477 477
478void cgit_print_http_headers(struct cgit_context *ctx) 478void cgit_print_http_headers(struct cgit_context *ctx)
479{ 479{
480 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) 480 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
481 return; 481 return;
482 482
483 if (ctx->page.status) 483 if (ctx->page.status)
484 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 484 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
485 if (ctx->page.mimetype && ctx->page.charset) 485 if (ctx->page.mimetype && ctx->page.charset)
486 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 486 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
487 ctx->page.charset); 487 ctx->page.charset);
488 else if (ctx->page.mimetype) 488 else if (ctx->page.mimetype)
489 htmlf("Content-Type: %s\n", ctx->page.mimetype); 489 htmlf("Content-Type: %s\n", ctx->page.mimetype);
490 if (ctx->page.size) 490 if (ctx->page.size)
491 htmlf("Content-Length: %ld\n", ctx->page.size); 491 htmlf("Content-Length: %ld\n", ctx->page.size);
492 if (ctx->page.filename) 492 if (ctx->page.filename)
493 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 493 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
494 ctx->page.filename); 494 ctx->page.filename);
495 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 495 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
496 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 496 htmlf("Expires: %s\n", http_date(ctx->page.expires));
497 if (ctx->page.etag) 497 if (ctx->page.etag)
498 htmlf("ETag: \"%s\"\n", ctx->page.etag); 498 htmlf("ETag: \"%s\"\n", ctx->page.etag);
499 html("\n"); 499 html("\n");
500 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) 500 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
501 exit(0); 501 exit(0);
502} 502}
503 503
504void cgit_print_docstart(struct cgit_context *ctx) 504void cgit_print_docstart(struct cgit_context *ctx)
505{ 505{
506 if (ctx->cfg.embedded) { 506 if (ctx->cfg.embedded) {
507 if (ctx->cfg.header) 507 if (ctx->cfg.header)
508 html_include(ctx->cfg.header); 508 html_include(ctx->cfg.header);
509 return; 509 return;
510 } 510 }
511 511
512 char *host = cgit_hosturl(); 512 char *host = cgit_hosturl();
513 html(cgit_doctype); 513 html(cgit_doctype);
514 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 514 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
515 html("<head>\n"); 515 html("<head>\n");
516 html("<title>"); 516 html("<title>");
517 html_txt(ctx->page.title); 517 html_txt(ctx->page.title);
518 html("</title>\n"); 518 html("</title>\n");
519 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 519 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
520 if (ctx->cfg.robots && *ctx->cfg.robots) 520 if (ctx->cfg.robots && *ctx->cfg.robots)
521 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 521 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
522 html("<link rel='stylesheet' type='text/css' href='"); 522 html("<link rel='stylesheet' type='text/css' href='");
523 html_attr(ctx->cfg.css); 523 html_attr(ctx->cfg.css);
524 html("'/>\n"); 524 html("'/>\n");
525 if (ctx->cfg.favicon) { 525 if (ctx->cfg.favicon) {
526 html("<link rel='shortcut icon' href='"); 526 html("<link rel='shortcut icon' href='");
527 html_attr(ctx->cfg.favicon); 527 html_attr(ctx->cfg.favicon);
528 html("'/>\n"); 528 html("'/>\n");
529 } 529 }
530 if (host && ctx->repo) { 530 if (host && ctx->repo) {
531 html("<link rel='alternate' title='Atom feed' href='"); 531 html("<link rel='alternate' title='Atom feed' href='");
532 html(cgit_httpscheme()); 532 html(cgit_httpscheme());
533 html_attr(cgit_hosturl()); 533 html_attr(cgit_hosturl());
534 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 534 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
535 fmt("h=%s", ctx->qry.head))); 535 fmt("h=%s", ctx->qry.head)));
536 html("' type='application/atom+xml'/>\n"); 536 html("' type='application/atom+xml'/>\n");
537 } 537 }
538 if (ctx->cfg.head_include) 538 if (ctx->cfg.head_include)
539 html_include(ctx->cfg.head_include); 539 html_include(ctx->cfg.head_include);
540 html("</head>\n"); 540 html("</head>\n");
541 html("<body>\n"); 541 html("<body>\n");
542 if (ctx->cfg.header) 542 if (ctx->cfg.header)
543 html_include(ctx->cfg.header); 543 html_include(ctx->cfg.header);
544} 544}
545 545
546void cgit_print_docend() 546void cgit_print_docend()
547{ 547{
548 html("</div> <!-- class=content -->\n"); 548 html("</div> <!-- class=content -->\n");
549 if (ctx.cfg.embedded) { 549 if (ctx.cfg.embedded) {
550 html("</div> <!-- id=cgit -->\n"); 550 html("</div> <!-- id=cgit -->\n");
551 if (ctx.cfg.footer) 551 if (ctx.cfg.footer)
552 html_include(ctx.cfg.footer); 552 html_include(ctx.cfg.footer);
553 return; 553 return;
554 } 554 }
555 if (ctx.cfg.footer) 555 if (ctx.cfg.footer)
556 html_include(ctx.cfg.footer); 556 html_include(ctx.cfg.footer);
557 else { 557 else {
558 htmlf("<div class='footer'>generated by cgit %s at ", 558 htmlf("<div class='footer'>generated by cgit %s at ",
559 cgit_version); 559 cgit_version);
560 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 560 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
561 html("</div>\n"); 561 html("</div>\n");
562 } 562 }
563 html("</div> <!-- id=cgit -->\n"); 563 html("</div> <!-- id=cgit -->\n");
564 html("</body>\n</html>\n"); 564 html("</body>\n</html>\n");
565} 565}
566 566
567int print_branch_option(const char *refname, const unsigned char *sha1, 567int print_branch_option(const char *refname, const unsigned char *sha1,
568 int flags, void *cb_data) 568 int flags, void *cb_data)
569{ 569{
570 char *name = (char *)refname; 570 char *name = (char *)refname;
571 html_option(name, name, ctx.qry.head); 571 html_option(name, name, ctx.qry.head);
572 return 0; 572 return 0;
573} 573}
574 574
575int print_archive_ref(const char *refname, const unsigned char *sha1, 575int print_archive_ref(const char *refname, const unsigned char *sha1,
576 int flags, void *cb_data) 576 int flags, void *cb_data)
577{ 577{
578 struct tag *tag; 578 struct tag *tag;
579 struct taginfo *info; 579 struct taginfo *info;
580 struct object *obj; 580 struct object *obj;
581 char buf[256], *url; 581 char buf[256], *url;
582 unsigned char fileid[20]; 582 unsigned char fileid[20];
583 int *header = (int *)cb_data; 583 int *header = (int *)cb_data;
584 584
585 if (prefixcmp(refname, "refs/archives")) 585 if (prefixcmp(refname, "refs/archives"))
586 return 0; 586 return 0;
587 strncpy(buf, refname+14, sizeof(buf)); 587 strncpy(buf, refname+14, sizeof(buf));
588 obj = parse_object(sha1); 588 obj = parse_object(sha1);
589 if (!obj) 589 if (!obj)
590 return 1; 590 return 1;
591 if (obj->type == OBJ_TAG) { 591 if (obj->type == OBJ_TAG) {
592 tag = lookup_tag(sha1); 592 tag = lookup_tag(sha1);
593 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 593 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
594 return 0; 594 return 0;
595 hashcpy(fileid, tag->tagged->sha1); 595 hashcpy(fileid, tag->tagged->sha1);
596 } else if (obj->type != OBJ_BLOB) { 596 } else if (obj->type != OBJ_BLOB) {
597 return 0; 597 return 0;
598 } else { 598 } else {
599 hashcpy(fileid, sha1); 599 hashcpy(fileid, sha1);
600 } 600 }
601 if (!*header) { 601 if (!*header) {
602 html("<h1>download</h1>\n"); 602 html("<h1>download</h1>\n");
603 *header = 1; 603 *header = 1;
604 } 604 }
605 url = cgit_pageurl(ctx.qry.repo, "blob", 605 url = cgit_pageurl(ctx.qry.repo, "blob",
606 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 606 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
607 buf)); 607 buf));
608 html_link_open(url, NULL, "menu"); 608 html_link_open(url, NULL, "menu");
609 html_txt(strlpart(buf, 20)); 609 html_txt(strlpart(buf, 20));
610 html_link_close(); 610 html_link_close();
611 return 0; 611 return 0;
612} 612}
613 613
614void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) 614void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
615{ 615{
616 char *url; 616 char *url;
617 617
618 if (!ctx.cfg.virtual_root) { 618 if (!ctx.cfg.virtual_root) {
619 url = fmt("%s/%s", ctx.qry.repo, page); 619 url = fmt("%s/%s", ctx.qry.repo, page);
620 if (ctx.qry.path) 620 if (ctx.qry.path)
621 url = fmt("%s/%s", url, ctx.qry.path); 621 url = fmt("%s/%s", url, ctx.qry.path);
622 html_hidden("url", url); 622 html_hidden("url", url);
623 } 623 }
624 624
625 if (incl_head && ctx.qry.head && ctx.repo->defbranch && 625 if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
626 strcmp(ctx.qry.head, ctx.repo->defbranch)) 626 strcmp(ctx.qry.head, ctx.repo->defbranch))
627 html_hidden("h", ctx.qry.head); 627 html_hidden("h", ctx.qry.head);
628 628
629 if (ctx.qry.sha1) 629 if (ctx.qry.sha1)
630 html_hidden("id", ctx.qry.sha1); 630 html_hidden("id", ctx.qry.sha1);
631 if (ctx.qry.sha2) 631 if (ctx.qry.sha2)
632 html_hidden("id2", ctx.qry.sha2); 632 html_hidden("id2", ctx.qry.sha2);
633 if (ctx.qry.showmsg) 633 if (ctx.qry.showmsg)
634 html_hidden("showmsg", "1"); 634 html_hidden("showmsg", "1");
635 635
636 if (incl_search) { 636 if (incl_search) {
637 if (ctx.qry.grep) 637 if (ctx.qry.grep)
638 html_hidden("qt", ctx.qry.grep); 638 html_hidden("qt", ctx.qry.grep);
639 if (ctx.qry.search) 639 if (ctx.qry.search)
640 html_hidden("q", ctx.qry.search); 640 html_hidden("q", ctx.qry.search);
641 } 641 }
642} 642}
643 643
644const char *fallback_cmd = "repolist"; 644const char *fallback_cmd = "repolist";
645 645
646char *hc(struct cgit_cmd *cmd, const char *page) 646char *hc(struct cgit_cmd *cmd, const char *page)
647{ 647{
648 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); 648 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
649} 649}
650 650
651static void print_header(struct cgit_context *ctx) 651static void print_header(struct cgit_context *ctx)
652{ 652{
653 html("<table id='header'>\n"); 653 html("<table id='header'>\n");
654 html("<tr>\n"); 654 html("<tr>\n");
655 655
656 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { 656 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
657 html("<td class='logo' rowspan='2'><a href='"); 657 html("<td class='logo' rowspan='2'><a href='");
658 if (ctx->cfg.logo_link) 658 if (ctx->cfg.logo_link)
659 html_attr(ctx->cfg.logo_link); 659 html_attr(ctx->cfg.logo_link);
660 else 660 else
661 html_attr(cgit_rooturl()); 661 html_attr(cgit_rooturl());
662 html("'><img src='"); 662 html("'><img src='");
663 html_attr(ctx->cfg.logo); 663 html_attr(ctx->cfg.logo);
664 html("' alt='cgit logo'/></a></td>\n"); 664 html("' alt='cgit logo'/></a></td>\n");
665 } 665 }
666 666
667 html("<td class='main'>"); 667 html("<td class='main'>");
668 if (ctx->repo) { 668 if (ctx->repo) {
669 cgit_index_link("index", NULL, NULL, NULL, 0); 669 cgit_index_link("index", NULL, NULL, NULL, 0);
670 html(" : "); 670 html(" : ");
671 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); 671 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
672 html("</td><td class='form'>"); 672 html("</td><td class='form'>");
673 html("<form method='get' action=''>\n"); 673 html("<form method='get' action=''>\n");
674 cgit_add_hidden_formfields(0, 1, ctx->qry.page); 674 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
675 html("<select name='h' onchange='this.form.submit();'>\n"); 675 html("<select name='h' onchange='this.form.submit();'>\n");
676 for_each_branch_ref(print_branch_option, ctx->qry.head); 676 for_each_branch_ref(print_branch_option, ctx->qry.head);
677 html("</select> "); 677 html("</select> ");
678 html("<input type='submit' name='' value='switch'/>"); 678 html("<input type='submit' name='' value='switch'/>");
679 html("</form>"); 679 html("</form>");
680 } else 680 } else
681 html_txt(ctx->cfg.root_title); 681 html_txt(ctx->cfg.root_title);
682 html("</td></tr>\n"); 682 html("</td></tr>\n");
683 683
684 html("<tr><td class='sub'>"); 684 html("<tr><td class='sub'>");
685 if (ctx->repo) { 685 if (ctx->repo) {
686 html_txt(ctx->repo->desc); 686 html_txt(ctx->repo->desc);
687 html("</td><td class='sub right'>"); 687 html("</td><td class='sub right'>");
688 html_txt(ctx->repo->owner); 688 html_txt(ctx->repo->owner);
689 } else { 689 } else {
690 if (ctx->cfg.root_desc) 690 if (ctx->cfg.root_desc)
691 html_txt(ctx->cfg.root_desc); 691 html_txt(ctx->cfg.root_desc);
692 else if (ctx->cfg.index_info) 692 else if (ctx->cfg.index_info)
693 html_include(ctx->cfg.index_info); 693 html_include(ctx->cfg.index_info);
694 } 694 }
695 html("</td></tr></table>\n"); 695 html("</td></tr></table>\n");
696} 696}
697 697
698void cgit_print_pageheader(struct cgit_context *ctx) 698void cgit_print_pageheader(struct cgit_context *ctx)
699{ 699{
700 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 700 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
701 701
702 if (!cmd && ctx->repo) 702 if (!cmd && ctx->repo)
703 fallback_cmd = "summary"; 703 fallback_cmd = "summary";
704 704
705 html("<div id='cgit'>"); 705 html("<div id='cgit'>");
706 if (!ctx->cfg.noheader) 706 if (!ctx->cfg.noheader)
707 print_header(ctx); 707 print_header(ctx);
708 708
709 html("<table class='tabs'><tr><td>\n"); 709 html("<table class='tabs'><tr><td>\n");
710 if (ctx->repo) { 710 if (ctx->repo) {
711 cgit_summary_link("summary", NULL, hc(cmd, "summary"), 711 cgit_summary_link("summary", NULL, hc(cmd, "summary"),
712 ctx->qry.head); 712 ctx->qry.head);
713 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 713 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
714 ctx->qry.sha1, NULL); 714 ctx->qry.sha1, NULL);
715 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 715 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
716 NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); 716 NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
717 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 717 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
718 ctx->qry.sha1, NULL); 718 ctx->qry.sha1, NULL);
719 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 719 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
720 ctx->qry.head, ctx->qry.sha1, 0); 720 ctx->qry.head, ctx->qry.sha1, 0);
721 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 721 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
722 ctx->qry.sha1, ctx->qry.sha2, NULL, 0); 722 ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
723 if (ctx->repo->max_stats) 723 if (ctx->repo->max_stats)
724 cgit_stats_link("stats", NULL, hc(cmd, "stats"), 724 cgit_stats_link("stats", NULL, hc(cmd, "stats"),
725 ctx->qry.head, NULL); 725 ctx->qry.head, NULL);
726 if (ctx->repo->readme) 726 if (ctx->repo->readme)
727 reporevlink("about", "about", NULL, 727 reporevlink("about", "about", NULL,
728 hc(cmd, "about"), ctx->qry.head, NULL, 728 hc(cmd, "about"), ctx->qry.head, NULL,
729 NULL); 729 NULL);
730 html("</td><td class='form'>"); 730 html("</td><td class='form'>");
731 html("<form class='right' method='get' action='"); 731 html("<form class='right' method='get' action='");
732 if (ctx->cfg.virtual_root) 732 if (ctx->cfg.virtual_root)
733 html_url_path(cgit_fileurl(ctx->qry.repo, "log", 733 html_url_path(cgit_fileurl(ctx->qry.repo, "log",
734 ctx->qry.path, NULL)); 734 ctx->qry.path, NULL));
735 html("'>\n"); 735 html("'>\n");
736 cgit_add_hidden_formfields(1, 0, "log"); 736 cgit_add_hidden_formfields(1, 0, "log");
737 html("<select name='qt'>\n"); 737 html("<select name='qt'>\n");
738 html_option("grep", "log msg", ctx->qry.grep); 738 html_option("grep", "log msg", ctx->qry.grep);
739 html_option("author", "author", ctx->qry.grep); 739 html_option("author", "author", ctx->qry.grep);
740 html_option("committer", "committer", ctx->qry.grep); 740 html_option("committer", "committer", ctx->qry.grep);
741 html("</select>\n"); 741 html("</select>\n");
742 html("<input class='txt' type='text' size='10' name='q' value='"); 742 html("<input class='txt' type='text' size='10' name='q' value='");
743 html_attr(ctx->qry.search); 743 html_attr(ctx->qry.search);
744 html("'/>\n"); 744 html("'/>\n");
745 html("<input type='submit' value='search'/>\n"); 745 html("<input type='submit' value='search'/>\n");
746 html("</form>\n"); 746 html("</form>\n");
747 } else { 747 } else {
748 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); 748 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
749 if (ctx->cfg.root_readme) 749 if (ctx->cfg.root_readme)
750 site_link("about", "about", NULL, hc(cmd, "about"), 750 site_link("about", "about", NULL, hc(cmd, "about"),
751 NULL, 0); 751 NULL, 0);
752 html("</td><td class='form'>"); 752 html("</td><td class='form'>");
753 html("<form method='get' action='"); 753 html("<form method='get' action='");
754 html_attr(cgit_rooturl()); 754 html_attr(cgit_rooturl());
755 html("'>\n"); 755 html("'>\n");
756 html("<input type='text' name='q' size='10' value='"); 756 html("<input type='text' name='q' size='10' value='");
757 html_attr(ctx->qry.search); 757 html_attr(ctx->qry.search);
758 html("'/>\n"); 758 html("'/>\n");
759 html("<input type='submit' value='search'/>\n"); 759 html("<input type='submit' value='search'/>\n");
760 html("</form>"); 760 html("</form>");
761 } 761 }
762 html("</td></tr></table>\n"); 762 html("</td></tr></table>\n");
763 html("<div class='content'>"); 763 html("<div class='content'>");
764} 764}
765 765
766void cgit_print_filemode(unsigned short mode) 766void cgit_print_filemode(unsigned short mode)
767{ 767{
768 if (S_ISDIR(mode)) 768 if (S_ISDIR(mode))
769 html("d"); 769 html("d");
770 else if (S_ISLNK(mode)) 770 else if (S_ISLNK(mode))
771 html("l"); 771 html("l");
772 else if (S_ISGITLINK(mode)) 772 else if (S_ISGITLINK(mode))
773 html("m"); 773 html("m");
774 else 774 else
775 html("-"); 775 html("-");
776 html_fileperm(mode >> 6); 776 html_fileperm(mode >> 6);
777 html_fileperm(mode >> 3); 777 html_fileperm(mode >> 3);
778 html_fileperm(mode); 778 html_fileperm(mode);
779} 779}
780 780
781void cgit_print_snapshot_links(const char *repo, const char *head, 781void cgit_print_snapshot_links(const char *repo, const char *head,
782 const char *hex, int snapshots) 782 const char *hex, int snapshots)
783{ 783{
784 const struct cgit_snapshot_format* f; 784 const struct cgit_snapshot_format* f;
785 char *prefix; 785 char *prefix;
786 char *filename; 786 char *filename;
787 unsigned char sha1[20]; 787 unsigned char sha1[20];
788 788
789 if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && 789 if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
790 (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) 790 (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
791 hex++; 791 hex++;
792 prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); 792 prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
793 for (f = cgit_snapshot_formats; f->suffix; f++) { 793 for (f = cgit_snapshot_formats; f->suffix; f++) {
794 if (!(snapshots & f->bit)) 794 if (!(snapshots & f->bit))
795 continue; 795 continue;
796 filename = fmt("%s%s", prefix, f->suffix); 796 filename = fmt("%s%s", prefix, f->suffix);
797 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); 797 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
798 html("<br/>"); 798 html("<br/>");
799 } 799 }
800} 800}