summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-09 11:45:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-09 11:45:36 (UTC)
commit17e3ff42646f182911fd0e5d872082977538db9e (patch) (unidiff)
tree6fedf480751b534ac11066dd143fd0589cad284a
parentb4c3562f57c924866314d0f80f46dddecd4ce61a (diff)
parentc4d46c7035d07070ac1ebf0c0b44df927358687f (diff)
downloadcgit-17e3ff42646f182911fd0e5d872082977538db9e.zip
cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.gz
cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.bz2
Merge branch 'lh/mimetypes'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c11
-rw-r--r--cgit.h2
-rw-r--r--cgitrc.5.txt17
-rw-r--r--ui-plain.c20
4 files changed, 45 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index f6bb0c7..aa1107a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,153 +1,163 @@
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)
21{
22 struct string_list_item *item;
23
24 item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
25 item->util = xstrdup(value);
26}
27
20void config_cb(const char *name, const char *value) 28void config_cb(const char *name, const char *value)
21{ 29{
22 if (!strcmp(name, "root-title")) 30 if (!strcmp(name, "root-title"))
23 ctx.cfg.root_title = xstrdup(value); 31 ctx.cfg.root_title = xstrdup(value);
24 else if (!strcmp(name, "root-desc")) 32 else if (!strcmp(name, "root-desc"))
25 ctx.cfg.root_desc = xstrdup(value); 33 ctx.cfg.root_desc = xstrdup(value);
26 else if (!strcmp(name, "root-readme")) 34 else if (!strcmp(name, "root-readme"))
27 ctx.cfg.root_readme = xstrdup(value); 35 ctx.cfg.root_readme = xstrdup(value);
28 else if (!strcmp(name, "css")) 36 else if (!strcmp(name, "css"))
29 ctx.cfg.css = xstrdup(value); 37 ctx.cfg.css = xstrdup(value);
30 else if (!strcmp(name, "favicon")) 38 else if (!strcmp(name, "favicon"))
31 ctx.cfg.favicon = xstrdup(value); 39 ctx.cfg.favicon = xstrdup(value);
32 else if (!strcmp(name, "footer")) 40 else if (!strcmp(name, "footer"))
33 ctx.cfg.footer = xstrdup(value); 41 ctx.cfg.footer = xstrdup(value);
34 else if (!strcmp(name, "head-include")) 42 else if (!strcmp(name, "head-include"))
35 ctx.cfg.head_include = xstrdup(value); 43 ctx.cfg.head_include = xstrdup(value);
36 else if (!strcmp(name, "header")) 44 else if (!strcmp(name, "header"))
37 ctx.cfg.header = xstrdup(value); 45 ctx.cfg.header = xstrdup(value);
38 else if (!strcmp(name, "logo")) 46 else if (!strcmp(name, "logo"))
39 ctx.cfg.logo = xstrdup(value); 47 ctx.cfg.logo = xstrdup(value);
40 else if (!strcmp(name, "index-header")) 48 else if (!strcmp(name, "index-header"))
41 ctx.cfg.index_header = xstrdup(value); 49 ctx.cfg.index_header = xstrdup(value);
42 else if (!strcmp(name, "index-info")) 50 else if (!strcmp(name, "index-info"))
43 ctx.cfg.index_info = xstrdup(value); 51 ctx.cfg.index_info = xstrdup(value);
44 else if (!strcmp(name, "logo-link")) 52 else if (!strcmp(name, "logo-link"))
45 ctx.cfg.logo_link = xstrdup(value); 53 ctx.cfg.logo_link = xstrdup(value);
46 else if (!strcmp(name, "module-link")) 54 else if (!strcmp(name, "module-link"))
47 ctx.cfg.module_link = xstrdup(value); 55 ctx.cfg.module_link = xstrdup(value);
48 else if (!strcmp(name, "virtual-root")) { 56 else if (!strcmp(name, "virtual-root")) {
49 ctx.cfg.virtual_root = trim_end(value, '/'); 57 ctx.cfg.virtual_root = trim_end(value, '/');
50 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 58 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
51 ctx.cfg.virtual_root = ""; 59 ctx.cfg.virtual_root = "";
52 } else if (!strcmp(name, "nocache")) 60 } else if (!strcmp(name, "nocache"))
53 ctx.cfg.nocache = atoi(value); 61 ctx.cfg.nocache = atoi(value);
54 else if (!strcmp(name, "noplainemail")) 62 else if (!strcmp(name, "noplainemail"))
55 ctx.cfg.noplainemail = atoi(value); 63 ctx.cfg.noplainemail = atoi(value);
56 else if (!strcmp(name, "noheader")) 64 else if (!strcmp(name, "noheader"))
57 ctx.cfg.noheader = atoi(value); 65 ctx.cfg.noheader = atoi(value);
58 else if (!strcmp(name, "snapshots")) 66 else if (!strcmp(name, "snapshots"))
59 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 67 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
60 else if (!strcmp(name, "enable-index-links")) 68 else if (!strcmp(name, "enable-index-links"))
61 ctx.cfg.enable_index_links = atoi(value); 69 ctx.cfg.enable_index_links = atoi(value);
62 else if (!strcmp(name, "enable-log-filecount")) 70 else if (!strcmp(name, "enable-log-filecount"))
63 ctx.cfg.enable_log_filecount = atoi(value); 71 ctx.cfg.enable_log_filecount = atoi(value);
64 else if (!strcmp(name, "enable-log-linecount")) 72 else if (!strcmp(name, "enable-log-linecount"))
65 ctx.cfg.enable_log_linecount = atoi(value); 73 ctx.cfg.enable_log_linecount = atoi(value);
66 else if (!strcmp(name, "max-stats")) 74 else if (!strcmp(name, "max-stats"))
67 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 75 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
68 else if (!strcmp(name, "cache-size")) 76 else if (!strcmp(name, "cache-size"))
69 ctx.cfg.cache_size = atoi(value); 77 ctx.cfg.cache_size = atoi(value);
70 else if (!strcmp(name, "cache-root")) 78 else if (!strcmp(name, "cache-root"))
71 ctx.cfg.cache_root = xstrdup(value); 79 ctx.cfg.cache_root = xstrdup(value);
72 else if (!strcmp(name, "cache-root-ttl")) 80 else if (!strcmp(name, "cache-root-ttl"))
73 ctx.cfg.cache_root_ttl = atoi(value); 81 ctx.cfg.cache_root_ttl = atoi(value);
74 else if (!strcmp(name, "cache-repo-ttl")) 82 else if (!strcmp(name, "cache-repo-ttl"))
75 ctx.cfg.cache_repo_ttl = atoi(value); 83 ctx.cfg.cache_repo_ttl = atoi(value);
76 else if (!strcmp(name, "cache-static-ttl")) 84 else if (!strcmp(name, "cache-static-ttl"))
77 ctx.cfg.cache_static_ttl = atoi(value); 85 ctx.cfg.cache_static_ttl = atoi(value);
78 else if (!strcmp(name, "cache-dynamic-ttl")) 86 else if (!strcmp(name, "cache-dynamic-ttl"))
79 ctx.cfg.cache_dynamic_ttl = atoi(value); 87 ctx.cfg.cache_dynamic_ttl = atoi(value);
80 else if (!strcmp(name, "embedded")) 88 else if (!strcmp(name, "embedded"))
81 ctx.cfg.embedded = atoi(value); 89 ctx.cfg.embedded = atoi(value);
82 else if (!strcmp(name, "max-message-length")) 90 else if (!strcmp(name, "max-message-length"))
83 ctx.cfg.max_msg_len = atoi(value); 91 ctx.cfg.max_msg_len = atoi(value);
84 else if (!strcmp(name, "max-repodesc-length")) 92 else if (!strcmp(name, "max-repodesc-length"))
85 ctx.cfg.max_repodesc_len = atoi(value); 93 ctx.cfg.max_repodesc_len = atoi(value);
86 else if (!strcmp(name, "max-repo-count")) 94 else if (!strcmp(name, "max-repo-count"))
87 ctx.cfg.max_repo_count = atoi(value); 95 ctx.cfg.max_repo_count = atoi(value);
88 else if (!strcmp(name, "max-commit-count")) 96 else if (!strcmp(name, "max-commit-count"))
89 ctx.cfg.max_commit_count = atoi(value); 97 ctx.cfg.max_commit_count = atoi(value);
90 else if (!strcmp(name, "summary-log")) 98 else if (!strcmp(name, "summary-log"))
91 ctx.cfg.summary_log = atoi(value); 99 ctx.cfg.summary_log = atoi(value);
92 else if (!strcmp(name, "summary-branches")) 100 else if (!strcmp(name, "summary-branches"))
93 ctx.cfg.summary_branches = atoi(value); 101 ctx.cfg.summary_branches = atoi(value);
94 else if (!strcmp(name, "summary-tags")) 102 else if (!strcmp(name, "summary-tags"))
95 ctx.cfg.summary_tags = atoi(value); 103 ctx.cfg.summary_tags = atoi(value);
96 else if (!strcmp(name, "agefile")) 104 else if (!strcmp(name, "agefile"))
97 ctx.cfg.agefile = xstrdup(value); 105 ctx.cfg.agefile = xstrdup(value);
98 else if (!strcmp(name, "renamelimit")) 106 else if (!strcmp(name, "renamelimit"))
99 ctx.cfg.renamelimit = atoi(value); 107 ctx.cfg.renamelimit = atoi(value);
100 else if (!strcmp(name, "robots")) 108 else if (!strcmp(name, "robots"))
101 ctx.cfg.robots = xstrdup(value); 109 ctx.cfg.robots = xstrdup(value);
102 else if (!strcmp(name, "clone-prefix")) 110 else if (!strcmp(name, "clone-prefix"))
103 ctx.cfg.clone_prefix = xstrdup(value); 111 ctx.cfg.clone_prefix = xstrdup(value);
104 else if (!strcmp(name, "local-time")) 112 else if (!strcmp(name, "local-time"))
105 ctx.cfg.local_time = atoi(value); 113 ctx.cfg.local_time = atoi(value);
114 else if (!prefixcmp(name, "mimetype."))
115 add_mimetype(name + 9, value);
106 else if (!strcmp(name, "repo.group")) 116 else if (!strcmp(name, "repo.group"))
107 ctx.cfg.repo_group = xstrdup(value); 117 ctx.cfg.repo_group = xstrdup(value);
108 else if (!strcmp(name, "repo.url")) 118 else if (!strcmp(name, "repo.url"))
109 ctx.repo = cgit_add_repo(value); 119 ctx.repo = cgit_add_repo(value);
110 else if (!strcmp(name, "repo.name")) 120 else if (!strcmp(name, "repo.name"))
111 ctx.repo->name = xstrdup(value); 121 ctx.repo->name = xstrdup(value);
112 else if (ctx.repo && !strcmp(name, "repo.path")) 122 else if (ctx.repo && !strcmp(name, "repo.path"))
113 ctx.repo->path = trim_end(value, '/'); 123 ctx.repo->path = trim_end(value, '/');
114 else if (ctx.repo && !strcmp(name, "repo.clone-url")) 124 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
115 ctx.repo->clone_url = xstrdup(value); 125 ctx.repo->clone_url = xstrdup(value);
116 else if (ctx.repo && !strcmp(name, "repo.desc")) 126 else if (ctx.repo && !strcmp(name, "repo.desc"))
117 ctx.repo->desc = xstrdup(value); 127 ctx.repo->desc = xstrdup(value);
118 else if (ctx.repo && !strcmp(name, "repo.owner")) 128 else if (ctx.repo && !strcmp(name, "repo.owner"))
119 ctx.repo->owner = xstrdup(value); 129 ctx.repo->owner = xstrdup(value);
120 else if (ctx.repo && !strcmp(name, "repo.defbranch")) 130 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
121 ctx.repo->defbranch = xstrdup(value); 131 ctx.repo->defbranch = xstrdup(value);
122 else if (ctx.repo && !strcmp(name, "repo.snapshots")) 132 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
123 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 133 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
124 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) 134 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
125 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 135 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
126 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 136 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
127 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 137 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
128 else if (ctx.repo && !strcmp(name, "repo.max-stats")) 138 else if (ctx.repo && !strcmp(name, "repo.max-stats"))
129 ctx.repo->max_stats = cgit_find_stats_period(value, NULL); 139 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
130 else if (ctx.repo && !strcmp(name, "repo.module-link")) 140 else if (ctx.repo && !strcmp(name, "repo.module-link"))
131 ctx.repo->module_link= xstrdup(value); 141 ctx.repo->module_link= xstrdup(value);
132 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 142 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
133 if (*value == '/') 143 if (*value == '/')
134 ctx.repo->readme = xstrdup(value); 144 ctx.repo->readme = xstrdup(value);
135 else 145 else
136 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 146 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
137 } else if (!strcmp(name, "include")) 147 } else if (!strcmp(name, "include"))
138 parse_configfile(value, config_cb); 148 parse_configfile(value, config_cb);
139} 149}
140 150
141static void querystring_cb(const char *name, const char *value) 151static void querystring_cb(const char *name, const char *value)
142{ 152{
143 if (!strcmp(name,"r")) { 153 if (!strcmp(name,"r")) {
144 ctx.qry.repo = xstrdup(value); 154 ctx.qry.repo = xstrdup(value);
145 ctx.repo = cgit_get_repoinfo(value); 155 ctx.repo = cgit_get_repoinfo(value);
146 } else if (!strcmp(name, "p")) { 156 } else if (!strcmp(name, "p")) {
147 ctx.qry.page = xstrdup(value); 157 ctx.qry.page = xstrdup(value);
148 } else if (!strcmp(name, "url")) { 158 } else if (!strcmp(name, "url")) {
149 ctx.qry.url = xstrdup(value); 159 ctx.qry.url = xstrdup(value);
150 cgit_parse_url(value); 160 cgit_parse_url(value);
151 } else if (!strcmp(name, "qt")) { 161 } else if (!strcmp(name, "qt")) {
152 ctx.qry.grep = xstrdup(value); 162 ctx.qry.grep = xstrdup(value);
153 } else if (!strcmp(name, "q")) { 163 } else if (!strcmp(name, "q")) {
@@ -170,96 +180,97 @@ static void querystring_cb(const char *name, const char *value)
170 } else if (!strcmp(name, "mimetype")) { 180 } else if (!strcmp(name, "mimetype")) {
171 ctx.qry.mimetype = xstrdup(value); 181 ctx.qry.mimetype = xstrdup(value);
172 } else if (!strcmp(name, "s")){ 182 } else if (!strcmp(name, "s")){
173 ctx.qry.sort = xstrdup(value); 183 ctx.qry.sort = xstrdup(value);
174 } else if (!strcmp(name, "showmsg")) { 184 } else if (!strcmp(name, "showmsg")) {
175 ctx.qry.showmsg = atoi(value); 185 ctx.qry.showmsg = atoi(value);
176 } else if (!strcmp(name, "period")) { 186 } else if (!strcmp(name, "period")) {
177 ctx.qry.period = xstrdup(value); 187 ctx.qry.period = xstrdup(value);
178 } 188 }
179} 189}
180 190
181static void prepare_context(struct cgit_context *ctx) 191static void prepare_context(struct cgit_context *ctx)
182{ 192{
183 memset(ctx, 0, sizeof(ctx)); 193 memset(ctx, 0, sizeof(ctx));
184 ctx->cfg.agefile = "info/web/last-modified"; 194 ctx->cfg.agefile = "info/web/last-modified";
185 ctx->cfg.nocache = 0; 195 ctx->cfg.nocache = 0;
186 ctx->cfg.cache_size = 0; 196 ctx->cfg.cache_size = 0;
187 ctx->cfg.cache_dynamic_ttl = 5; 197 ctx->cfg.cache_dynamic_ttl = 5;
188 ctx->cfg.cache_max_create_time = 5; 198 ctx->cfg.cache_max_create_time = 5;
189 ctx->cfg.cache_repo_ttl = 5; 199 ctx->cfg.cache_repo_ttl = 5;
190 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 200 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
191 ctx->cfg.cache_root_ttl = 5; 201 ctx->cfg.cache_root_ttl = 5;
192 ctx->cfg.cache_static_ttl = -1; 202 ctx->cfg.cache_static_ttl = -1;
193 ctx->cfg.css = "/cgit.css"; 203 ctx->cfg.css = "/cgit.css";
194 ctx->cfg.logo = "/git-logo.png"; 204 ctx->cfg.logo = "/git-logo.png";
195 ctx->cfg.local_time = 0; 205 ctx->cfg.local_time = 0;
196 ctx->cfg.max_repo_count = 50; 206 ctx->cfg.max_repo_count = 50;
197 ctx->cfg.max_commit_count = 50; 207 ctx->cfg.max_commit_count = 50;
198 ctx->cfg.max_lock_attempts = 5; 208 ctx->cfg.max_lock_attempts = 5;
199 ctx->cfg.max_msg_len = 80; 209 ctx->cfg.max_msg_len = 80;
200 ctx->cfg.max_repodesc_len = 80; 210 ctx->cfg.max_repodesc_len = 80;
201 ctx->cfg.max_stats = 0; 211 ctx->cfg.max_stats = 0;
202 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 212 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
203 ctx->cfg.renamelimit = -1; 213 ctx->cfg.renamelimit = -1;
204 ctx->cfg.robots = "index, nofollow"; 214 ctx->cfg.robots = "index, nofollow";
205 ctx->cfg.root_title = "Git repository browser"; 215 ctx->cfg.root_title = "Git repository browser";
206 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 216 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
207 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 217 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
208 ctx->cfg.summary_branches = 10; 218 ctx->cfg.summary_branches = 10;
209 ctx->cfg.summary_log = 10; 219 ctx->cfg.summary_log = 10;
210 ctx->cfg.summary_tags = 10; 220 ctx->cfg.summary_tags = 10;
211 ctx->page.mimetype = "text/html"; 221 ctx->page.mimetype = "text/html";
212 ctx->page.charset = PAGE_ENCODING; 222 ctx->page.charset = PAGE_ENCODING;
213 ctx->page.filename = NULL; 223 ctx->page.filename = NULL;
214 ctx->page.size = 0; 224 ctx->page.size = 0;
215 ctx->page.modified = time(NULL); 225 ctx->page.modified = time(NULL);
216 ctx->page.expires = ctx->page.modified; 226 ctx->page.expires = ctx->page.modified;
217 ctx->page.etag = NULL; 227 ctx->page.etag = NULL;
228 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
218} 229}
219 230
220struct refmatch { 231struct refmatch {
221 char *req_ref; 232 char *req_ref;
222 char *first_ref; 233 char *first_ref;
223 int match; 234 int match;
224}; 235};
225 236
226int find_current_ref(const char *refname, const unsigned char *sha1, 237int find_current_ref(const char *refname, const unsigned char *sha1,
227 int flags, void *cb_data) 238 int flags, void *cb_data)
228{ 239{
229 struct refmatch *info; 240 struct refmatch *info;
230 241
231 info = (struct refmatch *)cb_data; 242 info = (struct refmatch *)cb_data;
232 if (!strcmp(refname, info->req_ref)) 243 if (!strcmp(refname, info->req_ref))
233 info->match = 1; 244 info->match = 1;
234 if (!info->first_ref) 245 if (!info->first_ref)
235 info->first_ref = xstrdup(refname); 246 info->first_ref = xstrdup(refname);
236 return info->match; 247 return info->match;
237} 248}
238 249
239char *find_default_branch(struct cgit_repo *repo) 250char *find_default_branch(struct cgit_repo *repo)
240{ 251{
241 struct refmatch info; 252 struct refmatch info;
242 char *ref; 253 char *ref;
243 254
244 info.req_ref = repo->defbranch; 255 info.req_ref = repo->defbranch;
245 info.first_ref = NULL; 256 info.first_ref = NULL;
246 info.match = 0; 257 info.match = 0;
247 for_each_branch_ref(find_current_ref, &info); 258 for_each_branch_ref(find_current_ref, &info);
248 if (info.match) 259 if (info.match)
249 ref = info.req_ref; 260 ref = info.req_ref;
250 else 261 else
251 ref = info.first_ref; 262 ref = info.first_ref;
252 if (ref) 263 if (ref)
253 ref = xstrdup(ref); 264 ref = xstrdup(ref);
254 return ref; 265 return ref;
255} 266}
256 267
257static int prepare_repo_cmd(struct cgit_context *ctx) 268static int prepare_repo_cmd(struct cgit_context *ctx)
258{ 269{
259 char *tmp; 270 char *tmp;
260 unsigned char sha1[20]; 271 unsigned char sha1[20];
261 int nongit = 0; 272 int nongit = 0;
262 273
263 setenv("GIT_DIR", ctx->repo->path, 1); 274 setenv("GIT_DIR", ctx->repo->path, 1);
264 setup_git_directory_gently(&nongit); 275 setup_git_directory_gently(&nongit);
265 if (nongit) { 276 if (nongit) {
diff --git a/cgit.h b/cgit.h
index acb5e8f..1194eb0 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,65 +1,66 @@
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 <string-list.h>
18#include <xdiff-interface.h> 19#include <xdiff-interface.h>
19#include <xdiff/xdiff.h> 20#include <xdiff/xdiff.h>
20#include <utf8.h> 21#include <utf8.h>
21 22
22 23
23/* 24/*
24 * Dateformats used on misc. pages 25 * Dateformats used on misc. pages
25 */ 26 */
26#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" 27#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
27#define FMT_SHORTDATE "%Y-%m-%d" 28#define FMT_SHORTDATE "%Y-%m-%d"
28#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" 29#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
29 30
30 31
31/* 32/*
32 * Limits used for relative dates 33 * Limits used for relative dates
33 */ 34 */
34#define TM_MIN 60 35#define TM_MIN 60
35#define TM_HOUR (TM_MIN * 60) 36#define TM_HOUR (TM_MIN * 60)
36#define TM_DAY (TM_HOUR * 24) 37#define TM_DAY (TM_HOUR * 24)
37#define TM_WEEK (TM_DAY * 7) 38#define TM_WEEK (TM_DAY * 7)
38#define TM_YEAR (TM_DAY * 365) 39#define TM_YEAR (TM_DAY * 365)
39#define TM_MONTH (TM_YEAR / 12.0) 40#define TM_MONTH (TM_YEAR / 12.0)
40 41
41 42
42/* 43/*
43 * Default encoding 44 * Default encoding
44 */ 45 */
45#define PAGE_ENCODING "UTF-8" 46#define PAGE_ENCODING "UTF-8"
46 47
47typedef void (*configfn)(const char *name, const char *value); 48typedef void (*configfn)(const char *name, const char *value);
48typedef void (*filepair_fn)(struct diff_filepair *pair); 49typedef void (*filepair_fn)(struct diff_filepair *pair);
49typedef void (*linediff_fn)(char *line, int len); 50typedef void (*linediff_fn)(char *line, int len);
50 51
51struct cgit_repo { 52struct cgit_repo {
52 char *url; 53 char *url;
53 char *name; 54 char *name;
54 char *path; 55 char *path;
55 char *desc; 56 char *desc;
56 char *owner; 57 char *owner;
57 char *defbranch; 58 char *defbranch;
58 char *group; 59 char *group;
59 char *module_link; 60 char *module_link;
60 char *readme; 61 char *readme;
61 char *clone_url; 62 char *clone_url;
62 int snapshots; 63 int snapshots;
63 int enable_log_filecount; 64 int enable_log_filecount;
64 int enable_log_linecount; 65 int enable_log_linecount;
65 int max_stats; 66 int max_stats;
@@ -130,96 +131,97 @@ struct cgit_query {
130}; 131};
131 132
132struct cgit_config { 133struct cgit_config {
133 char *agefile; 134 char *agefile;
134 char *cache_root; 135 char *cache_root;
135 char *clone_prefix; 136 char *clone_prefix;
136 char *css; 137 char *css;
137 char *favicon; 138 char *favicon;
138 char *footer; 139 char *footer;
139 char *head_include; 140 char *head_include;
140 char *header; 141 char *header;
141 char *index_header; 142 char *index_header;
142 char *index_info; 143 char *index_info;
143 char *logo; 144 char *logo;
144 char *logo_link; 145 char *logo_link;
145 char *module_link; 146 char *module_link;
146 char *repo_group; 147 char *repo_group;
147 char *robots; 148 char *robots;
148 char *root_title; 149 char *root_title;
149 char *root_desc; 150 char *root_desc;
150 char *root_readme; 151 char *root_readme;
151 char *script_name; 152 char *script_name;
152 char *virtual_root; 153 char *virtual_root;
153 int cache_size; 154 int cache_size;
154 int cache_dynamic_ttl; 155 int cache_dynamic_ttl;
155 int cache_max_create_time; 156 int cache_max_create_time;
156 int cache_repo_ttl; 157 int cache_repo_ttl;
157 int cache_root_ttl; 158 int cache_root_ttl;
158 int cache_static_ttl; 159 int cache_static_ttl;
159 int embedded; 160 int embedded;
160 int enable_index_links; 161 int enable_index_links;
161 int enable_log_filecount; 162 int enable_log_filecount;
162 int enable_log_linecount; 163 int enable_log_linecount;
163 int local_time; 164 int local_time;
164 int max_repo_count; 165 int max_repo_count;
165 int max_commit_count; 166 int max_commit_count;
166 int max_lock_attempts; 167 int max_lock_attempts;
167 int max_msg_len; 168 int max_msg_len;
168 int max_repodesc_len; 169 int max_repodesc_len;
169 int max_stats; 170 int max_stats;
170 int nocache; 171 int nocache;
171 int noplainemail; 172 int noplainemail;
172 int noheader; 173 int noheader;
173 int renamelimit; 174 int renamelimit;
174 int snapshots; 175 int snapshots;
175 int summary_branches; 176 int summary_branches;
176 int summary_log; 177 int summary_log;
177 int summary_tags; 178 int summary_tags;
179 struct string_list mimetypes;
178}; 180};
179 181
180struct cgit_page { 182struct cgit_page {
181 time_t modified; 183 time_t modified;
182 time_t expires; 184 time_t expires;
183 size_t size; 185 size_t size;
184 char *mimetype; 186 char *mimetype;
185 char *charset; 187 char *charset;
186 char *filename; 188 char *filename;
187 char *etag; 189 char *etag;
188 char *title; 190 char *title;
189 int status; 191 int status;
190 char *statusmsg; 192 char *statusmsg;
191}; 193};
192 194
193struct cgit_context { 195struct cgit_context {
194 struct cgit_query qry; 196 struct cgit_query qry;
195 struct cgit_config cfg; 197 struct cgit_config cfg;
196 struct cgit_repo *repo; 198 struct cgit_repo *repo;
197 struct cgit_page page; 199 struct cgit_page page;
198}; 200};
199 201
200struct cgit_snapshot_format { 202struct cgit_snapshot_format {
201 const char *suffix; 203 const char *suffix;
202 const char *mimetype; 204 const char *mimetype;
203 write_archive_fn_t write_func; 205 write_archive_fn_t write_func;
204 int bit; 206 int bit;
205}; 207};
206 208
207extern const char *cgit_version; 209extern const char *cgit_version;
208 210
209extern struct cgit_repolist cgit_repolist; 211extern struct cgit_repolist cgit_repolist;
210extern struct cgit_context ctx; 212extern struct cgit_context ctx;
211extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 213extern const struct cgit_snapshot_format cgit_snapshot_formats[];
212 214
213extern struct cgit_repo *cgit_add_repo(const char *url); 215extern struct cgit_repo *cgit_add_repo(const char *url);
214extern struct cgit_repo *cgit_get_repoinfo(const char *url); 216extern struct cgit_repo *cgit_get_repoinfo(const char *url);
215extern void cgit_repo_config_cb(const char *name, const char *value); 217extern void cgit_repo_config_cb(const char *name, const char *value);
216 218
217extern int chk_zero(int result, char *msg); 219extern int chk_zero(int result, char *msg);
218extern int chk_positive(int result, char *msg); 220extern int chk_positive(int result, char *msg);
219extern int chk_non_negative(int result, char *msg); 221extern int chk_non_negative(int result, char *msg);
220 222
221extern char *trim_end(const char *str, char c); 223extern char *trim_end(const char *str, char c);
222extern char *strlpart(char *txt, int maxlen); 224extern char *strlpart(char *txt, int maxlen);
223extern char *strrpart(char *txt, int maxlen); 225extern char *strrpart(char *txt, int maxlen);
224 226
225extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 227extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7754923..0412f64 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -102,96 +102,100 @@ include::
102 file is parsed. Default value: none. 102 file is parsed. Default value: none.
103 103
104index-header:: 104index-header::
105 The content of the file specified with this option will be included 105 The content of the file specified with this option will be included
106 verbatim above the repository index. This setting is deprecated, and 106 verbatim above the repository index. This setting is deprecated, and
107 will not be supported by cgit-1.0 (use root-readme instead). Default 107 will not be supported by cgit-1.0 (use root-readme instead). Default
108 value: none. 108 value: none.
109 109
110index-info:: 110index-info::
111 The content of the file specified with this option will be included 111 The content of the file specified with this option will be included
112 verbatim below the heading on the repository index page. This setting 112 verbatim below the heading on the repository index page. This setting
113 is deprecated, and will not be supported by cgit-1.0 (use root-desc 113 is deprecated, and will not be supported by cgit-1.0 (use root-desc
114 instead). Default value: none. 114 instead). Default value: none.
115 115
116local-time:: 116local-time::
117 Flag which, if set to "1", makes cgit print commit and tag times in the 117 Flag which, if set to "1", makes cgit print commit and tag times in the
118 servers timezone. Default value: "0". 118 servers timezone. Default value: "0".
119 119
120logo:: 120logo::
121 Url which specifies the source of an image which will be used as a logo 121 Url which specifies the source of an image which will be used as a logo
122 on all cgit pages. 122 on all cgit pages.
123 123
124logo-link:: 124logo-link::
125 Url loaded when clicking on the cgit logo image. If unspecified the 125 Url loaded when clicking on the cgit logo image. If unspecified the
126 calculated url of the repository index page will be used. Default 126 calculated url of the repository index page will be used. Default
127 value: none. 127 value: none.
128 128
129max-commit-count:: 129max-commit-count::
130 Specifies the number of entries to list per page in "log" view. Default 130 Specifies the number of entries to list per page in "log" view. Default
131 value: "50". 131 value: "50".
132 132
133max-message-length:: 133max-message-length::
134 Specifies the maximum number of commit message characters to display in 134 Specifies the maximum number of commit message characters to display in
135 "log" view. Default value: "80". 135 "log" view. Default value: "80".
136 136
137max-repo-count:: 137max-repo-count::
138 Specifies the number of entries to list per page on therepository 138 Specifies the number of entries to list per page on therepository
139 index page. Default value: "50". 139 index page. Default value: "50".
140 140
141max-repodesc-length:: 141max-repodesc-length::
142 Specifies the maximum number of repo description characters to display 142 Specifies the maximum number of repo description characters to display
143 on the repository index page. Default value: "80". 143 on the repository index page. Default value: "80".
144 144
145max-stats:: 145max-stats::
146 Set the default maximum statistics period. Valid values are "week", 146 Set the default maximum statistics period. Valid values are "week",
147 "month", "quarter" and "year". If unspecified, statistics are 147 "month", "quarter" and "year". If unspecified, statistics are
148 disabled. Default value: none. See also: "repo.max-stats". 148 disabled. Default value: none. See also: "repo.max-stats".
149 149
150mimetype.<ext>::
151 Set the mimetype for the specified filename extension. This is used
152 by the `plain` command when returning blob content.
153
150module-link:: 154module-link::
151 Text which will be used as the formatstring for a hyperlink when a 155 Text which will be used as the formatstring for a hyperlink when a
152 submodule is printed in a directory listing. The arguments for the 156 submodule is printed in a directory listing. The arguments for the
153 formatstring are the path and SHA1 of the submodule commit. Default 157 formatstring are the path and SHA1 of the submodule commit. Default
154 value: "./?repo=%s&page=commit&id=%s" 158 value: "./?repo=%s&page=commit&id=%s"
155 159
156nocache:: 160nocache::
157 If set to the value "1" caching will be disabled. This settings is 161 If set to the value "1" caching will be disabled. This settings is
158 deprecated, and will not be honored starting with cgit-1.0. Default 162 deprecated, and will not be honored starting with cgit-1.0. Default
159 value: "0". 163 value: "0".
160 164
161noplainemail:: 165noplainemail::
162 If set to "1" showing full author email adresses will be disabled. 166 If set to "1" showing full author email adresses will be disabled.
163 Default value: "0". 167 Default value: "0".
164 168
165noheader:: 169noheader::
166 Flag which, when set to "1", will make cgit omit the standard header 170 Flag which, when set to "1", will make cgit omit the standard header
167 on all pages. Default value: none. See also: "embedded". 171 on all pages. Default value: none. See also: "embedded".
168 172
169renamelimit:: 173renamelimit::
170 Maximum number of files to consider when detecting renames. The value 174 Maximum number of files to consider when detecting renames. The value
171 "-1" uses the compiletime value in git (for further info, look at 175 "-1" uses the compiletime value in git (for further info, look at
172 `man git-diff`). Default value: "-1". 176 `man git-diff`). Default value: "-1".
173 177
174repo.group:: 178repo.group::
175 A value for the current repository group, which all repositories 179 A value for the current repository group, which all repositories
176 specified after this setting will inherit. Default value: none. 180 specified after this setting will inherit. Default value: none.
177 181
178robots:: 182robots::
179 Text used as content for the "robots" meta-tag. Default value: 183 Text used as content for the "robots" meta-tag. Default value:
180 "index, nofollow". 184 "index, nofollow".
181 185
182root-desc:: 186root-desc::
183 Text printed below the heading on the repository index page. Default 187 Text printed below the heading on the repository index page. Default
184 value: "a fast webinterface for the git dscm". 188 value: "a fast webinterface for the git dscm".
185 189
186root-readme:: 190root-readme::
187 The content of the file specified with this option will be included 191 The content of the file specified with this option will be included
188 verbatim below the "about" link on the repository index page. Default 192 verbatim below the "about" link on the repository index page. Default
189 value: none. 193 value: none.
190 194
191root-title:: 195root-title::
192 Text printed as heading on the repository index page. Default value: 196 Text printed as heading on the repository index page. Default value:
193 "Git Repository Browser". 197 "Git Repository Browser".
194 198
195snapshots:: 199snapshots::
196 Text which specifies the default (and allowed) set of snapshot formats 200 Text which specifies the default (and allowed) set of snapshot formats
197 supported by cgit. The value is a space-separated list of zero or more 201 supported by cgit. The value is a space-separated list of zero or more
@@ -284,96 +288,109 @@ cache-size=1000
284# Specify some default clone prefixes 288# Specify some default clone prefixes
285clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git 289clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
286 290
287# Specify the css url 291# Specify the css url
288css=/css/cgit.css 292css=/css/cgit.css
289 293
290 294
291# Show extra links for each repository on the index page 295# Show extra links for each repository on the index page
292enable-index-links=1 296enable-index-links=1
293 297
294 298
295# Show number of affected files per commit on the log pages 299# Show number of affected files per commit on the log pages
296enable-log-filecount=1 300enable-log-filecount=1
297 301
298 302
299# Show number of added/removed lines per commit on the log pages 303# Show number of added/removed lines per commit on the log pages
300enable-log-linecount=1 304enable-log-linecount=1
301 305
302 306
303# Add a cgit favicon 307# Add a cgit favicon
304favicon=/favicon.ico 308favicon=/favicon.ico
305 309
306 310
307# Use a custom logo 311# Use a custom logo
308logo=/img/mylogo.png 312logo=/img/mylogo.png
309 313
310 314
311# Enable statistics per week, month and quarter 315# Enable statistics per week, month and quarter
312max-stats=quarter 316max-stats=quarter
313 317
314 318
315# Set the title and heading of the repository index page 319# Set the title and heading of the repository index page
316root-title=foobar.com git repositories 320root-title=foobar.com git repositories
317 321
318 322
319# Set a subheading for the repository index page 323# Set a subheading for the repository index page
320root-desc=tracking the foobar development 324root-desc=tracking the foobar development
321 325
322 326
323# Include some more info about foobar.com on the index page 327# Include some more info about foobar.com on the index page
324root-readme=/var/www/htdocs/about.html 328root-readme=/var/www/htdocs/about.html
325 329
326 330
327# Allow download of tar.gz, tar.bz2 and zip-files 331# Allow download of tar.gz, tar.bz2 and zip-files
328snapshots=tar.gz tar.bz2 zip 332snapshots=tar.gz tar.bz2 zip
329 333
330 334
331## 335##
336## List of common mimetypes
337##
338
339mimetype.git=image/git
340mimetype.html=text/html
341mimetype.jpg=image/jpeg
342mimetype.jpeg=image/jpeg
343mimetype.pdf=application/pdf
344mimetype.png=image/png
345mimetype.svg=image/svg+xml
346
347
348##
332## List of repositories. 349## List of repositories.
333## PS: Any repositories listed when repo.group is unset will not be 350## PS: Any repositories listed when repo.group is unset will not be
334## displayed under a group heading 351## displayed under a group heading
335## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') 352## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
336## and included like this: 353## and included like this:
337## include=/etc/cgitrepos 354## include=/etc/cgitrepos
338## 355##
339 356
340 357
341repo.url=foo 358repo.url=foo
342repo.path=/pub/git/foo.git 359repo.path=/pub/git/foo.git
343repo.desc=the master foo repository 360repo.desc=the master foo repository
344repo.owner=fooman@foobar.com 361repo.owner=fooman@foobar.com
345repo.readme=info/web/about.html 362repo.readme=info/web/about.html
346 363
347 364
348repo.url=bar 365repo.url=bar
349repo.path=/pub/git/bar.git 366repo.path=/pub/git/bar.git
350repo.desc=the bars for your foo 367repo.desc=the bars for your foo
351repo.owner=barman@foobar.com 368repo.owner=barman@foobar.com
352repo.readme=info/web/about.html 369repo.readme=info/web/about.html
353 370
354 371
355# The next repositories will be displayed under the 'extras' heading 372# The next repositories will be displayed under the 'extras' heading
356repo.group=extras 373repo.group=extras
357 374
358 375
359repo.url=baz 376repo.url=baz
360repo.path=/pub/git/baz.git 377repo.path=/pub/git/baz.git
361repo.desc=a set of extensions for bar users 378repo.desc=a set of extensions for bar users
362 379
363repo.url=wiz 380repo.url=wiz
364repo.path=/pub/git/wiz.git 381repo.path=/pub/git/wiz.git
365repo.desc=the wizard of foo 382repo.desc=the wizard of foo
366 383
367 384
368# Add some mirrored repositories 385# Add some mirrored repositories
369repo.group=mirrors 386repo.group=mirrors
370 387
371 388
372repo.url=git 389repo.url=git
373repo.path=/pub/git/git.git 390repo.path=/pub/git/git.git
374repo.desc=the dscm 391repo.desc=the dscm
375 392
376 393
377repo.url=linux 394repo.url=linux
378repo.path=/pub/git/linux.git 395repo.path=/pub/git/linux.git
379repo.desc=the kernel 396repo.desc=the kernel
diff --git a/ui-plain.c b/ui-plain.c
index 93a3a05..27c6dae 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,83 +1,93 @@
1/* ui-plain.c: functions for output of plain blobs by path 1/* ui-plain.c: functions for output of plain blobs by path
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 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 "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13char *curr_rev; 13char *curr_rev;
14char *match_path; 14char *match_path;
15int match; 15int match;
16 16
17static void print_object(const unsigned char *sha1, const char *path) 17static void print_object(const unsigned char *sha1, const char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf, *ext;
21 unsigned long size; 21 unsigned long size;
22 struct string_list_item *mime;
22 23
23 type = sha1_object_info(sha1, &size); 24 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 25 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 26 html_status(404, "Not found", 0);
26 return; 27 return;
27 } 28 }
28 29
29 buf = read_sha1_file(sha1, &type, &size); 30 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 31 if (!buf) {
31 html_status(404, "Not found", 0); 32 html_status(404, "Not found", 0);
32 return; 33 return;
33 } 34 }
34 if (buffer_is_binary(buf, size)) 35 ctx.page.mimetype = NULL;
35 ctx.page.mimetype = "application/octet-stream"; 36 ext = strrchr(path, '.');
36 else 37 if (ext && *(++ext)) {
37 ctx.page.mimetype = "text/plain"; 38 mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
39 if (mime)
40 ctx.page.mimetype = (char *)mime->util;
41 }
42 if (!ctx.page.mimetype) {
43 if (buffer_is_binary(buf, size))
44 ctx.page.mimetype = "application/octet-stream";
45 else
46 ctx.page.mimetype = "text/plain";
47 }
38 ctx.page.filename = fmt("%s", path); 48 ctx.page.filename = fmt("%s", path);
39 ctx.page.size = size; 49 ctx.page.size = size;
40 ctx.page.etag = sha1_to_hex(sha1); 50 ctx.page.etag = sha1_to_hex(sha1);
41 cgit_print_http_headers(&ctx); 51 cgit_print_http_headers(&ctx);
42 html_raw(buf, size); 52 html_raw(buf, size);
43 match = 1; 53 match = 1;
44} 54}
45 55
46static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 56static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
47 const char *pathname, unsigned mode, int stage, 57 const char *pathname, unsigned mode, int stage,
48 void *cbdata) 58 void *cbdata)
49{ 59{
50 if (S_ISDIR(mode)) 60 if (S_ISDIR(mode))
51 return READ_TREE_RECURSIVE; 61 return READ_TREE_RECURSIVE;
52 62
53 if (S_ISREG(mode)) 63 if (S_ISREG(mode))
54 print_object(sha1, pathname); 64 print_object(sha1, pathname);
55 65
56 return 0; 66 return 0;
57} 67}
58 68
59void cgit_print_plain(struct cgit_context *ctx) 69void cgit_print_plain(struct cgit_context *ctx)
60{ 70{
61 const char *rev = ctx->qry.sha1; 71 const char *rev = ctx->qry.sha1;
62 unsigned char sha1[20]; 72 unsigned char sha1[20];
63 struct commit *commit; 73 struct commit *commit;
64 const char *paths[] = {ctx->qry.path, NULL}; 74 const char *paths[] = {ctx->qry.path, NULL};
65 75
66 if (!rev) 76 if (!rev)
67 rev = ctx->qry.head; 77 rev = ctx->qry.head;
68 78
69 curr_rev = xstrdup(rev); 79 curr_rev = xstrdup(rev);
70 if (get_sha1(rev, sha1)) { 80 if (get_sha1(rev, sha1)) {
71 html_status(404, "Not found", 0); 81 html_status(404, "Not found", 0);
72 return; 82 return;
73 } 83 }
74 commit = lookup_commit_reference(sha1); 84 commit = lookup_commit_reference(sha1);
75 if (!commit || parse_commit(commit)) { 85 if (!commit || parse_commit(commit)) {
76 html_status(404, "Not found", 0); 86 html_status(404, "Not found", 0);
77 return; 87 return;
78 } 88 }
79 match_path = ctx->qry.path; 89 match_path = ctx->qry.path;
80 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 90 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
81 if (!match) 91 if (!match)
82 html_status(404, "Not found", 0); 92 html_status(404, "Not found", 0);
83} 93}