summaryrefslogtreecommitdiffabout
authorLars Hjemli <larsh@hatman.(none)>2008-07-19 18:40:30 (UTC)
committer Lars Hjemli <larsh@hatman.(none)>2008-07-19 18:47:39 (UTC)
commit502865a5ec40fed5f1f865cb34002aecaab8405e (patch) (unidiff)
treeab53ab68d6c56948502287ff3cdad45c409aebbb
parentde5e9281719809c5b07051faa88e95bd16e8d485 (diff)
downloadcgit-502865a5ec40fed5f1f865cb34002aecaab8405e.zip
cgit-502865a5ec40fed5f1f865cb34002aecaab8405e.tar.gz
cgit-502865a5ec40fed5f1f865cb34002aecaab8405e.tar.bz2
Add a favicon option to cgitrc
This option is used to specify a shortcut icon on all cgit pages. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc2
-rw-r--r--ui-shared.c5
4 files changed, 10 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 8f154c9..8795085 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,390 +1,392 @@
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
16const char *cgit_version = CGIT_VERSION; 16const char *cgit_version = CGIT_VERSION;
17 17
18void config_cb(const char *name, const char *value) 18void 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
121static void querystring_cb(const char *name, const char *value) 123static 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
154static void prepare_context(struct cgit_context *ctx) 156static void prepare_context(struct cgit_context *ctx)
155{ 157{
156 memset(ctx, 0, sizeof(ctx)); 158 memset(ctx, 0, sizeof(ctx));
157 ctx->cfg.agefile = "info/web/last-modified"; 159 ctx->cfg.agefile = "info/web/last-modified";
158 ctx->cfg.nocache = 0; 160 ctx->cfg.nocache = 0;
159 ctx->cfg.cache_size = 0; 161 ctx->cfg.cache_size = 0;
160 ctx->cfg.cache_dynamic_ttl = 5; 162 ctx->cfg.cache_dynamic_ttl = 5;
161 ctx->cfg.cache_max_create_time = 5; 163 ctx->cfg.cache_max_create_time = 5;
162 ctx->cfg.cache_repo_ttl = 5; 164 ctx->cfg.cache_repo_ttl = 5;
163 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 165 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
164 ctx->cfg.cache_root_ttl = 5; 166 ctx->cfg.cache_root_ttl = 5;
165 ctx->cfg.cache_static_ttl = -1; 167 ctx->cfg.cache_static_ttl = -1;
166 ctx->cfg.css = "/cgit.css"; 168 ctx->cfg.css = "/cgit.css";
167 ctx->cfg.logo = "/git-logo.png"; 169 ctx->cfg.logo = "/git-logo.png";
168 ctx->cfg.max_repo_count = 50; 170 ctx->cfg.max_repo_count = 50;
169 ctx->cfg.max_commit_count = 50; 171 ctx->cfg.max_commit_count = 50;
170 ctx->cfg.max_lock_attempts = 5; 172 ctx->cfg.max_lock_attempts = 5;
171 ctx->cfg.max_msg_len = 60; 173 ctx->cfg.max_msg_len = 60;
172 ctx->cfg.max_repodesc_len = 60; 174 ctx->cfg.max_repodesc_len = 60;
173 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 175 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
174 ctx->cfg.renamelimit = -1; 176 ctx->cfg.renamelimit = -1;
175 ctx->cfg.robots = "index, nofollow"; 177 ctx->cfg.robots = "index, nofollow";
176 ctx->cfg.root_title = "Git repository browser"; 178 ctx->cfg.root_title = "Git repository browser";
177 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 179 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
178 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 180 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
179 ctx->page.mimetype = "text/html"; 181 ctx->page.mimetype = "text/html";
180 ctx->page.charset = PAGE_ENCODING; 182 ctx->page.charset = PAGE_ENCODING;
181 ctx->page.filename = NULL; 183 ctx->page.filename = NULL;
182 ctx->page.modified = time(NULL); 184 ctx->page.modified = time(NULL);
183 ctx->page.expires = ctx->page.modified; 185 ctx->page.expires = ctx->page.modified;
184} 186}
185 187
186struct refmatch { 188struct refmatch {
187 char *req_ref; 189 char *req_ref;
188 char *first_ref; 190 char *first_ref;
189 int match; 191 int match;
190}; 192};
191 193
192int find_current_ref(const char *refname, const unsigned char *sha1, 194int find_current_ref(const char *refname, const unsigned char *sha1,
193 int flags, void *cb_data) 195 int flags, void *cb_data)
194{ 196{
195 struct refmatch *info; 197 struct refmatch *info;
196 198
197 info = (struct refmatch *)cb_data; 199 info = (struct refmatch *)cb_data;
198 if (!strcmp(refname, info->req_ref)) 200 if (!strcmp(refname, info->req_ref))
199 info->match = 1; 201 info->match = 1;
200 if (!info->first_ref) 202 if (!info->first_ref)
201 info->first_ref = xstrdup(refname); 203 info->first_ref = xstrdup(refname);
202 return info->match; 204 return info->match;
203} 205}
204 206
205char *find_default_branch(struct cgit_repo *repo) 207char *find_default_branch(struct cgit_repo *repo)
206{ 208{
207 struct refmatch info; 209 struct refmatch info;
208 210
209 info.req_ref = repo->defbranch; 211 info.req_ref = repo->defbranch;
210 info.first_ref = NULL; 212 info.first_ref = NULL;
211 info.match = 0; 213 info.match = 0;
212 for_each_branch_ref(find_current_ref, &info); 214 for_each_branch_ref(find_current_ref, &info);
213 if (info.match) 215 if (info.match)
214 return info.req_ref; 216 return info.req_ref;
215 else 217 else
216 return info.first_ref; 218 return info.first_ref;
217} 219}
218 220
219static int prepare_repo_cmd(struct cgit_context *ctx) 221static int prepare_repo_cmd(struct cgit_context *ctx)
220{ 222{
221 char *tmp; 223 char *tmp;
222 unsigned char sha1[20]; 224 unsigned char sha1[20];
223 int nongit = 0; 225 int nongit = 0;
224 226
225 setenv("GIT_DIR", ctx->repo->path, 1); 227 setenv("GIT_DIR", ctx->repo->path, 1);
226 setup_git_directory_gently(&nongit); 228 setup_git_directory_gently(&nongit);
227 if (nongit) { 229 if (nongit) {
228 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, 230 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
229 "config error"); 231 "config error");
230 tmp = fmt("Not a git repository: '%s'", ctx->repo->path); 232 tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
231 ctx->repo = NULL; 233 ctx->repo = NULL;
232 cgit_print_http_headers(ctx); 234 cgit_print_http_headers(ctx);
233 cgit_print_docstart(ctx); 235 cgit_print_docstart(ctx);
234 cgit_print_pageheader(ctx); 236 cgit_print_pageheader(ctx);
235 cgit_print_error(tmp); 237 cgit_print_error(tmp);
236 cgit_print_docend(); 238 cgit_print_docend();
237 return 1; 239 return 1;
238 } 240 }
239 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); 241 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
240 242
241 if (!ctx->qry.head) { 243 if (!ctx->qry.head) {
242 ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); 244 ctx->qry.head = xstrdup(find_default_branch(ctx->repo));
243 ctx->repo->defbranch = ctx->qry.head; 245 ctx->repo->defbranch = ctx->qry.head;
244 } 246 }
245 247
246 if (!ctx->qry.head) { 248 if (!ctx->qry.head) {
247 cgit_print_http_headers(ctx); 249 cgit_print_http_headers(ctx);
248 cgit_print_docstart(ctx); 250 cgit_print_docstart(ctx);
249 cgit_print_pageheader(ctx); 251 cgit_print_pageheader(ctx);
250 cgit_print_error("Repository seems to be empty"); 252 cgit_print_error("Repository seems to be empty");
251 cgit_print_docend(); 253 cgit_print_docend();
252 return 1; 254 return 1;
253 } 255 }
254 256
255 if (get_sha1(ctx->qry.head, sha1)) { 257 if (get_sha1(ctx->qry.head, sha1)) {
256 tmp = xstrdup(ctx->qry.head); 258 tmp = xstrdup(ctx->qry.head);
257 ctx->qry.head = ctx->repo->defbranch; 259 ctx->qry.head = ctx->repo->defbranch;
258 cgit_print_http_headers(ctx); 260 cgit_print_http_headers(ctx);
259 cgit_print_docstart(ctx); 261 cgit_print_docstart(ctx);
260 cgit_print_pageheader(ctx); 262 cgit_print_pageheader(ctx);
261 cgit_print_error(fmt("Invalid branch: %s", tmp)); 263 cgit_print_error(fmt("Invalid branch: %s", tmp));
262 cgit_print_docend(); 264 cgit_print_docend();
263 return 1; 265 return 1;
264 } 266 }
265 return 0; 267 return 0;
266} 268}
267 269
268static void process_request(void *cbdata) 270static void process_request(void *cbdata)
269{ 271{
270 struct cgit_context *ctx = cbdata; 272 struct cgit_context *ctx = cbdata;
271 struct cgit_cmd *cmd; 273 struct cgit_cmd *cmd;
272 274
273 cmd = cgit_get_cmd(ctx); 275 cmd = cgit_get_cmd(ctx);
274 if (!cmd) { 276 if (!cmd) {
275 ctx->page.title = "cgit error"; 277 ctx->page.title = "cgit error";
276 ctx->repo = NULL; 278 ctx->repo = NULL;
277 cgit_print_http_headers(ctx); 279 cgit_print_http_headers(ctx);
278 cgit_print_docstart(ctx); 280 cgit_print_docstart(ctx);
279 cgit_print_pageheader(ctx); 281 cgit_print_pageheader(ctx);
280 cgit_print_error("Invalid request"); 282 cgit_print_error("Invalid request");
281 cgit_print_docend(); 283 cgit_print_docend();
282 return; 284 return;
283 } 285 }
284 286
285 if (cmd->want_repo && !ctx->repo) { 287 if (cmd->want_repo && !ctx->repo) {
286 cgit_print_http_headers(ctx); 288 cgit_print_http_headers(ctx);
287 cgit_print_docstart(ctx); 289 cgit_print_docstart(ctx);
288 cgit_print_pageheader(ctx); 290 cgit_print_pageheader(ctx);
289 cgit_print_error(fmt("No repository selected")); 291 cgit_print_error(fmt("No repository selected"));
290 cgit_print_docend(); 292 cgit_print_docend();
291 return; 293 return;
292 } 294 }
293 295
294 if (ctx->repo && prepare_repo_cmd(ctx)) 296 if (ctx->repo && prepare_repo_cmd(ctx))
295 return; 297 return;
296 298
297 if (cmd->want_layout) { 299 if (cmd->want_layout) {
298 cgit_print_http_headers(ctx); 300 cgit_print_http_headers(ctx);
299 cgit_print_docstart(ctx); 301 cgit_print_docstart(ctx);
300 cgit_print_pageheader(ctx); 302 cgit_print_pageheader(ctx);
301 } 303 }
302 304
303 cmd->fn(ctx); 305 cmd->fn(ctx);
304 306
305 if (cmd->want_layout) 307 if (cmd->want_layout)
306 cgit_print_docend(); 308 cgit_print_docend();
307} 309}
308 310
309static void cgit_parse_args(int argc, const char **argv) 311static void cgit_parse_args(int argc, const char **argv)
310{ 312{
311 int i; 313 int i;
312 314
313 for (i = 1; i < argc; i++) { 315 for (i = 1; i < argc; i++) {
314 if (!strncmp(argv[i], "--cache=", 8)) { 316 if (!strncmp(argv[i], "--cache=", 8)) {
315 ctx.cfg.cache_root = xstrdup(argv[i]+8); 317 ctx.cfg.cache_root = xstrdup(argv[i]+8);
316 } 318 }
317 if (!strcmp(argv[i], "--nocache")) { 319 if (!strcmp(argv[i], "--nocache")) {
318 ctx.cfg.nocache = 1; 320 ctx.cfg.nocache = 1;
319 } 321 }
320 if (!strncmp(argv[i], "--query=", 8)) { 322 if (!strncmp(argv[i], "--query=", 8)) {
321 ctx.qry.raw = xstrdup(argv[i]+8); 323 ctx.qry.raw = xstrdup(argv[i]+8);
322 } 324 }
323 if (!strncmp(argv[i], "--repo=", 7)) { 325 if (!strncmp(argv[i], "--repo=", 7)) {
324 ctx.qry.repo = xstrdup(argv[i]+7); 326 ctx.qry.repo = xstrdup(argv[i]+7);
325 } 327 }
326 if (!strncmp(argv[i], "--page=", 7)) { 328 if (!strncmp(argv[i], "--page=", 7)) {
327 ctx.qry.page = xstrdup(argv[i]+7); 329 ctx.qry.page = xstrdup(argv[i]+7);
328 } 330 }
329 if (!strncmp(argv[i], "--head=", 7)) { 331 if (!strncmp(argv[i], "--head=", 7)) {
330 ctx.qry.head = xstrdup(argv[i]+7); 332 ctx.qry.head = xstrdup(argv[i]+7);
331 ctx.qry.has_symref = 1; 333 ctx.qry.has_symref = 1;
332 } 334 }
333 if (!strncmp(argv[i], "--sha1=", 7)) { 335 if (!strncmp(argv[i], "--sha1=", 7)) {
334 ctx.qry.sha1 = xstrdup(argv[i]+7); 336 ctx.qry.sha1 = xstrdup(argv[i]+7);
335 ctx.qry.has_sha1 = 1; 337 ctx.qry.has_sha1 = 1;
336 } 338 }
337 if (!strncmp(argv[i], "--ofs=", 6)) { 339 if (!strncmp(argv[i], "--ofs=", 6)) {
338 ctx.qry.ofs = atoi(argv[i]+6); 340 ctx.qry.ofs = atoi(argv[i]+6);
339 } 341 }
340 } 342 }
341} 343}
342 344
343static int calc_ttl() 345static int calc_ttl()
344{ 346{
345 if (!ctx.repo) 347 if (!ctx.repo)
346 return ctx.cfg.cache_root_ttl; 348 return ctx.cfg.cache_root_ttl;
347 349
348 if (!ctx.qry.page) 350 if (!ctx.qry.page)
349 return ctx.cfg.cache_repo_ttl; 351 return ctx.cfg.cache_repo_ttl;
350 352
351 if (ctx.qry.has_symref) 353 if (ctx.qry.has_symref)
352 return ctx.cfg.cache_dynamic_ttl; 354 return ctx.cfg.cache_dynamic_ttl;
353 355
354 if (ctx.qry.has_sha1) 356 if (ctx.qry.has_sha1)
355 return ctx.cfg.cache_static_ttl; 357 return ctx.cfg.cache_static_ttl;
356 358
357 return ctx.cfg.cache_repo_ttl; 359 return ctx.cfg.cache_repo_ttl;
358} 360}
359 361
360int main(int argc, const char **argv) 362int main(int argc, const char **argv)
361{ 363{
362 const char *cgit_config_env = getenv("CGIT_CONFIG"); 364 const char *cgit_config_env = getenv("CGIT_CONFIG");
363 int err, ttl; 365 int err, ttl;
364 366
365 prepare_context(&ctx); 367 prepare_context(&ctx);
366 cgit_repolist.length = 0; 368 cgit_repolist.length = 0;
367 cgit_repolist.count = 0; 369 cgit_repolist.count = 0;
368 cgit_repolist.repos = NULL; 370 cgit_repolist.repos = NULL;
369 371
370 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 372 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
371 config_cb); 373 config_cb);
372 ctx.repo = NULL; 374 ctx.repo = NULL;
373 if (getenv("SCRIPT_NAME")) 375 if (getenv("SCRIPT_NAME"))
374 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 376 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
375 if (getenv("QUERY_STRING")) 377 if (getenv("QUERY_STRING"))
376 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 378 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
377 cgit_parse_args(argc, argv); 379 cgit_parse_args(argc, argv);
378 http_parse_querystring(ctx.qry.raw, querystring_cb); 380 http_parse_querystring(ctx.qry.raw, querystring_cb);
379 381
380 ttl = calc_ttl(); 382 ttl = calc_ttl();
381 ctx.page.expires += ttl*60; 383 ctx.page.expires += ttl*60;
382 if (ctx.cfg.nocache) 384 if (ctx.cfg.nocache)
383 ctx.cfg.cache_size = 0; 385 ctx.cfg.cache_size = 0;
384 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 386 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
385 ctx.qry.raw, ttl, process_request, &ctx); 387 ctx.qry.raw, ttl, process_request, &ctx);
386 if (err) 388 if (err)
387 cgit_print_error(fmt("Error processing page: %s (%d)", 389 cgit_print_error(fmt("Error processing page: %s (%d)",
388 strerror(err), err)); 390 strerror(err), err));
389 return err; 391 return err;
390} 392}
diff --git a/cgit.h b/cgit.h
index d18d9ca..7881aca 100644
--- a/cgit.h
+++ b/cgit.h
@@ -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
45typedef void (*configfn)(const char *name, const char *value); 45typedef void (*configfn)(const char *name, const char *value);
46typedef void (*filepair_fn)(struct diff_filepair *pair); 46typedef void (*filepair_fn)(struct diff_filepair *pair);
47typedef void (*linediff_fn)(char *line, int len); 47typedef void (*linediff_fn)(char *line, int len);
48 48
49struct cgit_repo { 49struct 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
65struct cgit_repolist { 65struct 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
71struct commitinfo { 71struct 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
84struct taginfo { 84struct 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
91struct refinfo { 91struct 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
100struct reflist { 100struct 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
106struct cgit_query { 106struct 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
123struct cgit_config { 123struct 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
163struct cgit_page { 164struct 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
172struct cgit_context { 173struct 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
179struct cgit_snapshot_format { 180struct 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
186extern const char *cgit_version; 187extern const char *cgit_version;
187 188
188extern struct cgit_repolist cgit_repolist; 189extern struct cgit_repolist cgit_repolist;
189extern struct cgit_context ctx; 190extern struct cgit_context ctx;
190extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 191extern const struct cgit_snapshot_format cgit_snapshot_formats[];
191 192
192extern struct cgit_repo *cgit_add_repo(const char *url); 193extern struct cgit_repo *cgit_add_repo(const char *url);
193extern struct cgit_repo *cgit_get_repoinfo(const char *url); 194extern struct cgit_repo *cgit_get_repoinfo(const char *url);
194extern void cgit_repo_config_cb(const char *name, const char *value); 195extern void cgit_repo_config_cb(const char *name, const char *value);
195 196
196extern int chk_zero(int result, char *msg); 197extern int chk_zero(int result, char *msg);
197extern int chk_positive(int result, char *msg); 198extern int chk_positive(int result, char *msg);
198extern int chk_non_negative(int result, char *msg); 199extern int chk_non_negative(int result, char *msg);
199 200
200extern char *trim_end(const char *str, char c); 201extern char *trim_end(const char *str, char c);
201extern char *strlpart(char *txt, int maxlen); 202extern char *strlpart(char *txt, int maxlen);
202extern char *strrpart(char *txt, int maxlen); 203extern char *strrpart(char *txt, int maxlen);
203 204
204extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 205extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
205extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 206extern 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
208extern void *cgit_free_commitinfo(struct commitinfo *info); 209extern void *cgit_free_commitinfo(struct commitinfo *info);
209 210
210extern int cgit_diff_files(const unsigned char *old_sha1, 211extern 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
214extern void cgit_diff_tree(const unsigned char *old_sha1, 215extern 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
218extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 219extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
219 220
220extern char *fmt(const char *format,...); 221extern char *fmt(const char *format,...);
221 222
222extern struct commitinfo *cgit_parse_commit(struct commit *commit); 223extern struct commitinfo *cgit_parse_commit(struct commit *commit);
223extern struct taginfo *cgit_parse_tag(struct tag *tag); 224extern struct taginfo *cgit_parse_tag(struct tag *tag);
224extern void cgit_parse_url(const char *url); 225extern void cgit_parse_url(const char *url);
225 226
226extern const char *cgit_repobasename(const char *reponame); 227extern const char *cgit_repobasename(const char *reponame);
227 228
228extern int cgit_parse_snapshots_mask(const char *str); 229extern 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 */
234extern char *strcasestr(const char *haystack, const char *needle); 235extern char *strcasestr(const char *haystack, const char *needle);
235 236
236 237
237#endif /* CGIT_H */ 238#endif /* CGIT_H */
diff --git a/cgitrc b/cgitrc
index f1d8997..9e8a0f2 100644
--- a/cgitrc
+++ b/cgitrc
@@ -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
@@ -1,667 +1,672 @@
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", "Now", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Now", "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_rooturl() 37char *cgit_rooturl()
38{ 38{
39 if (ctx.cfg.virtual_root) 39 if (ctx.cfg.virtual_root)
40 return fmt("%s/", ctx.cfg.virtual_root); 40 return fmt("%s/", ctx.cfg.virtual_root);
41 else 41 else
42 return ctx.cfg.script_name; 42 return ctx.cfg.script_name;
43} 43}
44 44
45char *cgit_repourl(const char *reponame) 45char *cgit_repourl(const char *reponame)
46{ 46{
47 if (ctx.cfg.virtual_root) { 47 if (ctx.cfg.virtual_root) {
48 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 48 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
49 } else { 49 } else {
50 return fmt("?r=%s", reponame); 50 return fmt("?r=%s", reponame);
51 } 51 }
52} 52}
53 53
54char *cgit_fileurl(const char *reponame, const char *pagename, 54char *cgit_fileurl(const char *reponame, const char *pagename,
55 const char *filename, const char *query) 55 const char *filename, const char *query)
56{ 56{
57 char *tmp; 57 char *tmp;
58 char *delim; 58 char *delim;
59 59
60 if (ctx.cfg.virtual_root) { 60 if (ctx.cfg.virtual_root) {
61 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, 61 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
62 pagename, (filename ? filename:"")); 62 pagename, (filename ? filename:""));
63 delim = "?"; 63 delim = "?";
64 } else { 64 } else {
65 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 65 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
66 (filename ? filename : "")); 66 (filename ? filename : ""));
67 delim = "&"; 67 delim = "&";
68 } 68 }
69 if (query) 69 if (query)
70 tmp = fmt("%s%s%s", tmp, delim, query); 70 tmp = fmt("%s%s%s", tmp, delim, query);
71 return tmp; 71 return tmp;
72} 72}
73 73
74char *cgit_pageurl(const char *reponame, const char *pagename, 74char *cgit_pageurl(const char *reponame, const char *pagename,
75 const char *query) 75 const char *query)
76{ 76{
77 return cgit_fileurl(reponame,pagename,0,query); 77 return cgit_fileurl(reponame,pagename,0,query);
78} 78}
79 79
80const char *cgit_repobasename(const char *reponame) 80const char *cgit_repobasename(const char *reponame)
81{ 81{
82 /* I assume we don't need to store more than one repo basename */ 82 /* I assume we don't need to store more than one repo basename */
83 static char rvbuf[1024]; 83 static char rvbuf[1024];
84 int p; 84 int p;
85 const char *rv; 85 const char *rv;
86 strncpy(rvbuf,reponame,sizeof(rvbuf)); 86 strncpy(rvbuf,reponame,sizeof(rvbuf));
87 if(rvbuf[sizeof(rvbuf)-1]) 87 if(rvbuf[sizeof(rvbuf)-1])
88 die("cgit_repobasename: truncated repository name '%s'", reponame); 88 die("cgit_repobasename: truncated repository name '%s'", reponame);
89 p = strlen(rvbuf)-1; 89 p = strlen(rvbuf)-1;
90 /* strip trailing slashes */ 90 /* strip trailing slashes */
91 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 91 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
92 /* strip trailing .git */ 92 /* strip trailing .git */
93 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 93 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
94 p -= 3; rvbuf[p--] = 0; 94 p -= 3; rvbuf[p--] = 0;
95 } 95 }
96 /* strip more trailing slashes if any */ 96 /* strip more trailing slashes if any */
97 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 97 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
98 /* find last slash in the remaining string */ 98 /* find last slash in the remaining string */
99 rv = strrchr(rvbuf,'/'); 99 rv = strrchr(rvbuf,'/');
100 if(rv) 100 if(rv)
101 return ++rv; 101 return ++rv;
102 return rvbuf; 102 return rvbuf;
103} 103}
104 104
105char *cgit_currurl() 105char *cgit_currurl()
106{ 106{
107 if (!ctx.cfg.virtual_root) 107 if (!ctx.cfg.virtual_root)
108 return ctx.cfg.script_name; 108 return ctx.cfg.script_name;
109 else if (ctx.qry.page) 109 else if (ctx.qry.page)
110 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 110 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
111 else if (ctx.qry.repo) 111 else if (ctx.qry.repo)
112 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 112 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
113 else 113 else
114 return fmt("%s/", ctx.cfg.virtual_root); 114 return fmt("%s/", ctx.cfg.virtual_root);
115} 115}
116 116
117static void site_url(char *page, char *search, int ofs) 117static void site_url(char *page, char *search, int ofs)
118{ 118{
119 char *delim = "?"; 119 char *delim = "?";
120 120
121 if (ctx.cfg.virtual_root) { 121 if (ctx.cfg.virtual_root) {
122 html_attr(ctx.cfg.virtual_root); 122 html_attr(ctx.cfg.virtual_root);
123 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 123 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
124 html("/"); 124 html("/");
125 } else 125 } else
126 html(ctx.cfg.script_name); 126 html(ctx.cfg.script_name);
127 127
128 if (page) { 128 if (page) {
129 htmlf("?p=%s", page); 129 htmlf("?p=%s", page);
130 delim = "&"; 130 delim = "&";
131 } 131 }
132 if (search) { 132 if (search) {
133 html(delim); 133 html(delim);
134 html("q="); 134 html("q=");
135 html_attr(search); 135 html_attr(search);
136 delim = "&"; 136 delim = "&";
137 } 137 }
138 if (ofs) { 138 if (ofs) {
139 html(delim); 139 html(delim);
140 htmlf("ofs=%d", ofs); 140 htmlf("ofs=%d", ofs);
141 } 141 }
142} 142}
143 143
144static void site_link(char *page, char *name, char *title, char *class, 144static void site_link(char *page, char *name, char *title, char *class,
145 char *search, int ofs) 145 char *search, int ofs)
146{ 146{
147 html("<a"); 147 html("<a");
148 if (title) { 148 if (title) {
149 html(" title='"); 149 html(" title='");
150 html_attr(title); 150 html_attr(title);
151 html("'"); 151 html("'");
152 } 152 }
153 if (class) { 153 if (class) {
154 html(" class='"); 154 html(" class='");
155 html_attr(class); 155 html_attr(class);
156 html("'"); 156 html("'");
157 } 157 }
158 html(" href='"); 158 html(" href='");
159 site_url(page, search, ofs); 159 site_url(page, search, ofs);
160 html("'>"); 160 html("'>");
161 html_txt(name); 161 html_txt(name);
162 html("</a>"); 162 html("</a>");
163} 163}
164 164
165void cgit_index_link(char *name, char *title, char *class, char *pattern, 165void cgit_index_link(char *name, char *title, char *class, char *pattern,
166 int ofs) 166 int ofs)
167{ 167{
168 site_link(NULL, name, title, class, pattern, ofs); 168 site_link(NULL, name, title, class, pattern, ofs);
169} 169}
170 170
171static char *repolink(char *title, char *class, char *page, char *head, 171static char *repolink(char *title, char *class, char *page, char *head,
172 char *path) 172 char *path)
173{ 173{
174 char *delim = "?"; 174 char *delim = "?";
175 175
176 html("<a"); 176 html("<a");
177 if (title) { 177 if (title) {
178 html(" title='"); 178 html(" title='");
179 html_attr(title); 179 html_attr(title);
180 html("'"); 180 html("'");
181 } 181 }
182 if (class) { 182 if (class) {
183 html(" class='"); 183 html(" class='");
184 html_attr(class); 184 html_attr(class);
185 html("'"); 185 html("'");
186 } 186 }
187 html(" href='"); 187 html(" href='");
188 if (ctx.cfg.virtual_root) { 188 if (ctx.cfg.virtual_root) {
189 html_attr(ctx.cfg.virtual_root); 189 html_attr(ctx.cfg.virtual_root);
190 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 190 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
191 html("/"); 191 html("/");
192 html_attr(ctx.repo->url); 192 html_attr(ctx.repo->url);
193 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 193 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
194 html("/"); 194 html("/");
195 if (page) { 195 if (page) {
196 html(page); 196 html(page);
197 html("/"); 197 html("/");
198 if (path) 198 if (path)
199 html_attr(path); 199 html_attr(path);
200 } 200 }
201 } else { 201 } else {
202 html(ctx.cfg.script_name); 202 html(ctx.cfg.script_name);
203 html("?url="); 203 html("?url=");
204 html_attr(ctx.repo->url); 204 html_attr(ctx.repo->url);
205 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 205 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
206 html("/"); 206 html("/");
207 if (page) { 207 if (page) {
208 html(page); 208 html(page);
209 html("/"); 209 html("/");
210 if (path) 210 if (path)
211 html_attr(path); 211 html_attr(path);
212 } 212 }
213 delim = "&amp;"; 213 delim = "&amp;";
214 } 214 }
215 if (head && strcmp(head, ctx.repo->defbranch)) { 215 if (head && strcmp(head, ctx.repo->defbranch)) {
216 html(delim); 216 html(delim);
217 html("h="); 217 html("h=");
218 html_attr(head); 218 html_attr(head);
219 delim = "&amp;"; 219 delim = "&amp;";
220 } 220 }
221 return fmt("%s", delim); 221 return fmt("%s", delim);
222} 222}
223 223
224static void reporevlink(char *page, char *name, char *title, char *class, 224static void reporevlink(char *page, char *name, char *title, char *class,
225 char *head, char *rev, char *path) 225 char *head, char *rev, char *path)
226{ 226{
227 char *delim; 227 char *delim;
228 228
229 delim = repolink(title, class, page, head, path); 229 delim = repolink(title, class, page, head, path);
230 if (rev && strcmp(rev, ctx.qry.head)) { 230 if (rev && strcmp(rev, ctx.qry.head)) {
231 html(delim); 231 html(delim);
232 html("id="); 232 html("id=");
233 html_attr(rev); 233 html_attr(rev);
234 } 234 }
235 html("'>"); 235 html("'>");
236 html_txt(name); 236 html_txt(name);
237 html("</a>"); 237 html("</a>");
238} 238}
239 239
240void cgit_tree_link(char *name, char *title, char *class, char *head, 240void cgit_tree_link(char *name, char *title, char *class, char *head,
241 char *rev, char *path) 241 char *rev, char *path)
242{ 242{
243 reporevlink("tree", name, title, class, head, rev, path); 243 reporevlink("tree", name, title, class, head, rev, path);
244} 244}
245 245
246void cgit_log_link(char *name, char *title, char *class, char *head, 246void cgit_log_link(char *name, char *title, char *class, char *head,
247 char *rev, char *path, int ofs, char *grep, char *pattern) 247 char *rev, char *path, int ofs, char *grep, char *pattern)
248{ 248{
249 char *delim; 249 char *delim;
250 250
251 delim = repolink(title, class, "log", head, path); 251 delim = repolink(title, class, "log", head, path);
252 if (rev && strcmp(rev, ctx.qry.head)) { 252 if (rev && strcmp(rev, ctx.qry.head)) {
253 html(delim); 253 html(delim);
254 html("id="); 254 html("id=");
255 html_attr(rev); 255 html_attr(rev);
256 delim = "&"; 256 delim = "&";
257 } 257 }
258 if (grep && pattern) { 258 if (grep && pattern) {
259 html(delim); 259 html(delim);
260 html("qt="); 260 html("qt=");
261 html_attr(grep); 261 html_attr(grep);
262 delim = "&"; 262 delim = "&";
263 html(delim); 263 html(delim);
264 html("q="); 264 html("q=");
265 html_attr(pattern); 265 html_attr(pattern);
266 } 266 }
267 if (ofs > 0) { 267 if (ofs > 0) {
268 html(delim); 268 html(delim);
269 html("ofs="); 269 html("ofs=");
270 htmlf("%d", ofs); 270 htmlf("%d", ofs);
271 } 271 }
272 html("'>"); 272 html("'>");
273 html_txt(name); 273 html_txt(name);
274 html("</a>"); 274 html("</a>");
275} 275}
276 276
277void cgit_commit_link(char *name, char *title, char *class, char *head, 277void cgit_commit_link(char *name, char *title, char *class, char *head,
278 char *rev) 278 char *rev)
279{ 279{
280 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 280 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
281 name[ctx.cfg.max_msg_len] = '\0'; 281 name[ctx.cfg.max_msg_len] = '\0';
282 name[ctx.cfg.max_msg_len - 1] = '.'; 282 name[ctx.cfg.max_msg_len - 1] = '.';
283 name[ctx.cfg.max_msg_len - 2] = '.'; 283 name[ctx.cfg.max_msg_len - 2] = '.';
284 name[ctx.cfg.max_msg_len - 3] = '.'; 284 name[ctx.cfg.max_msg_len - 3] = '.';
285 } 285 }
286 reporevlink("commit", name, title, class, head, rev, NULL); 286 reporevlink("commit", name, title, class, head, rev, NULL);
287} 287}
288 288
289void cgit_refs_link(char *name, char *title, char *class, char *head, 289void cgit_refs_link(char *name, char *title, char *class, char *head,
290 char *rev, char *path) 290 char *rev, char *path)
291{ 291{
292 reporevlink("refs", name, title, class, head, rev, path); 292 reporevlink("refs", name, title, class, head, rev, path);
293} 293}
294 294
295void cgit_snapshot_link(char *name, char *title, char *class, char *head, 295void cgit_snapshot_link(char *name, char *title, char *class, char *head,
296 char *rev, char *archivename) 296 char *rev, char *archivename)
297{ 297{
298 reporevlink("snapshot", name, title, class, head, rev, archivename); 298 reporevlink("snapshot", name, title, class, head, rev, archivename);
299} 299}
300 300
301void cgit_diff_link(char *name, char *title, char *class, char *head, 301void cgit_diff_link(char *name, char *title, char *class, char *head,
302 char *new_rev, char *old_rev, char *path) 302 char *new_rev, char *old_rev, char *path)
303{ 303{
304 char *delim; 304 char *delim;
305 305
306 delim = repolink(title, class, "diff", head, path); 306 delim = repolink(title, class, "diff", head, path);
307 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 307 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
308 html(delim); 308 html(delim);
309 html("id="); 309 html("id=");
310 html_attr(new_rev); 310 html_attr(new_rev);
311 delim = "&amp;"; 311 delim = "&amp;";
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
323void cgit_patch_link(char *name, char *title, char *class, char *head, 323void 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
329void cgit_object_link(struct object *obj) 329void 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
356void cgit_print_date(time_t secs, char *format) 356void 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
368void cgit_print_age(time_t t, time_t max_relative, char *format) 368void 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
411void cgit_print_http_headers(struct cgit_context *ctx) 411void 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
426void cgit_print_docstart(struct cgit_context *ctx) 426void 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
444void cgit_print_docend() 449void 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
458int print_branch_option(const char *refname, const unsigned char *sha1, 463int 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
466int print_archive_ref(const char *refname, const unsigned char *sha1, 471int 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&amp;path=%s", sha1_to_hex(fileid), 502 fmt("id=%s&amp;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
505void add_hidden_formfields(int incl_head, int incl_search, char *page) 510void 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
532char *hc(struct cgit_cmd *cmd, const char *page) 537char *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
537void cgit_print_pageheader(struct cgit_context *ctx) 542void 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);
568 html("</td></tr>\n"); 573 html("</td></tr>\n");
569 574
570 html("<tr><td class='sub'"); 575 html("<tr><td class='sub'");
571 if (ctx->repo) { 576 if (ctx->repo) {
572 html(" colspan='2'>"); 577 html(" colspan='2'>");
573 html_txt(ctx->repo->desc); 578 html_txt(ctx->repo->desc);
574 } else { 579 } else {
575 html(">"); 580 html(">");
576 if (ctx->cfg.root_desc) 581 if (ctx->cfg.root_desc)
577 html_txt(ctx->cfg.root_desc); 582 html_txt(ctx->cfg.root_desc);
578 else if (ctx->cfg.index_info) 583 else if (ctx->cfg.index_info)
579 html_include(ctx->cfg.index_info); 584 html_include(ctx->cfg.index_info);
580 } 585 }
581 html("</td></tr></table>\n"); 586 html("</td></tr></table>\n");
582 587
583 html("<table class='tabs'><tr><td>\n"); 588 html("<table class='tabs'><tr><td>\n");
584 if (ctx->repo) { 589 if (ctx->repo) {
585 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), 590 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
586 ctx->qry.head, NULL, NULL); 591 ctx->qry.head, NULL, NULL);
587 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 592 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
588 ctx->qry.sha1, NULL); 593 ctx->qry.sha1, NULL);
589 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 594 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
590 NULL, NULL, 0, NULL, NULL); 595 NULL, NULL, 0, NULL, NULL);
591 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 596 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
592 ctx->qry.sha1, NULL); 597 ctx->qry.sha1, NULL);
593 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 598 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
594 ctx->qry.head, ctx->qry.sha1); 599 ctx->qry.head, ctx->qry.sha1);
595 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 600 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
596 ctx->qry.sha1, ctx->qry.sha2, NULL); 601 ctx->qry.sha1, ctx->qry.sha2, NULL);
597 if (ctx->repo->readme) 602 if (ctx->repo->readme)
598 reporevlink("about", "about", NULL, 603 reporevlink("about", "about", NULL,
599 hc(cmd, "about"), ctx->qry.head, NULL, 604 hc(cmd, "about"), ctx->qry.head, NULL,
600 NULL); 605 NULL);
601 html("</td><td class='form'>"); 606 html("</td><td class='form'>");
602 html("<form class='right' method='get' action='"); 607 html("<form class='right' method='get' action='");
603 if (ctx->cfg.virtual_root) 608 if (ctx->cfg.virtual_root)
604 html_attr(cgit_fileurl(ctx->qry.repo, "log", 609 html_attr(cgit_fileurl(ctx->qry.repo, "log",
605 ctx->qry.path, NULL)); 610 ctx->qry.path, NULL));
606 html("'>\n"); 611 html("'>\n");
607 add_hidden_formfields(1, 0, "log"); 612 add_hidden_formfields(1, 0, "log");
608 html("<select name='qt'>\n"); 613 html("<select name='qt'>\n");
609 html_option("grep", "log msg", ctx->qry.grep); 614 html_option("grep", "log msg", ctx->qry.grep);
610 html_option("author", "author", ctx->qry.grep); 615 html_option("author", "author", ctx->qry.grep);
611 html_option("committer", "committer", ctx->qry.grep); 616 html_option("committer", "committer", ctx->qry.grep);
612 html("</select>\n"); 617 html("</select>\n");
613 html("<input class='txt' type='text' size='10' name='q' value='"); 618 html("<input class='txt' type='text' size='10' name='q' value='");
614 html_attr(ctx->qry.search); 619 html_attr(ctx->qry.search);
615 html("'/>\n"); 620 html("'/>\n");
616 html("<input type='submit' value='search'/>\n"); 621 html("<input type='submit' value='search'/>\n");
617 html("</form>\n"); 622 html("</form>\n");
618 } else { 623 } else {
619 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); 624 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
620 if (ctx->cfg.root_readme) 625 if (ctx->cfg.root_readme)
621 site_link("about", "about", NULL, hc(cmd, "about"), 626 site_link("about", "about", NULL, hc(cmd, "about"),
622 NULL, 0); 627 NULL, 0);
623 html("</td><td class='form'>"); 628 html("</td><td class='form'>");
624 html("<form method='get' action='"); 629 html("<form method='get' action='");
625 html_attr(cgit_rooturl()); 630 html_attr(cgit_rooturl());
626 html("'>\n"); 631 html("'>\n");
627 html("<input type='text' name='q' size='10' value='"); 632 html("<input type='text' name='q' size='10' value='");
628 html_attr(ctx->qry.search); 633 html_attr(ctx->qry.search);
629 html("'/>\n"); 634 html("'/>\n");
630 html("<input type='submit' value='search'/>\n"); 635 html("<input type='submit' value='search'/>\n");
631 html("</form>"); 636 html("</form>");
632 } 637 }
633 html("</td></tr></table>\n"); 638 html("</td></tr></table>\n");
634 html("<div class='content'>"); 639 html("<div class='content'>");
635} 640}
636 641
637void cgit_print_filemode(unsigned short mode) 642void cgit_print_filemode(unsigned short mode)
638{ 643{
639 if (S_ISDIR(mode)) 644 if (S_ISDIR(mode))
640 html("d"); 645 html("d");
641 else if (S_ISLNK(mode)) 646 else if (S_ISLNK(mode))
642 html("l"); 647 html("l");
643 else if (S_ISGITLINK(mode)) 648 else if (S_ISGITLINK(mode))
644 html("m"); 649 html("m");
645 else 650 else
646 html("-"); 651 html("-");
647 html_fileperm(mode >> 6); 652 html_fileperm(mode >> 6);
648 html_fileperm(mode >> 3); 653 html_fileperm(mode >> 3);
649 html_fileperm(mode); 654 html_fileperm(mode);
650} 655}
651 656
652void cgit_print_snapshot_links(const char *repo, const char *head, 657void cgit_print_snapshot_links(const char *repo, const char *head,
653 const char *hex, int snapshots) 658 const char *hex, int snapshots)
654{ 659{
655 const struct cgit_snapshot_format* f; 660 const struct cgit_snapshot_format* f;
656 char *filename; 661 char *filename;
657 662
658 for (f = cgit_snapshot_formats; f->suffix; f++) { 663 for (f = cgit_snapshot_formats; f->suffix; f++) {
659 if (!(snapshots & f->bit)) 664 if (!(snapshots & f->bit))
660 continue; 665 continue;
661 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, 666 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
662 f->suffix); 667 f->suffix);
663 cgit_snapshot_link(filename, NULL, NULL, (char *)head, 668 cgit_snapshot_link(filename, NULL, NULL, (char *)head,
664 (char *)hex, filename); 669 (char *)hex, filename);
665 html("<br/>"); 670 html("<br/>");
666 } 671 }
667} 672}