|
diff --git a/cgit.c b/cgit.c index 08cb5d2..4f68a4b 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -139,196 +139,201 @@ void config_cb(const char *name, const char *value) |
139 | ctx.cfg.enable_log_linecount = atoi(value); |
139 | ctx.cfg.enable_log_linecount = atoi(value); |
140 | else if (!strcmp(name, "enable-tree-linenumbers")) |
140 | else if (!strcmp(name, "enable-tree-linenumbers")) |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
142 | else if (!strcmp(name, "max-stats")) |
142 | else if (!strcmp(name, "max-stats")) |
143 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
143 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
144 | else if (!strcmp(name, "cache-size")) |
144 | else if (!strcmp(name, "cache-size")) |
145 | ctx.cfg.cache_size = atoi(value); |
145 | ctx.cfg.cache_size = atoi(value); |
146 | else if (!strcmp(name, "cache-root")) |
146 | else if (!strcmp(name, "cache-root")) |
147 | ctx.cfg.cache_root = xstrdup(value); |
147 | ctx.cfg.cache_root = xstrdup(value); |
148 | else if (!strcmp(name, "cache-root-ttl")) |
148 | else if (!strcmp(name, "cache-root-ttl")) |
149 | ctx.cfg.cache_root_ttl = atoi(value); |
149 | ctx.cfg.cache_root_ttl = atoi(value); |
150 | else if (!strcmp(name, "cache-repo-ttl")) |
150 | else if (!strcmp(name, "cache-repo-ttl")) |
151 | ctx.cfg.cache_repo_ttl = atoi(value); |
151 | ctx.cfg.cache_repo_ttl = atoi(value); |
152 | else if (!strcmp(name, "cache-scanrc-ttl")) |
152 | else if (!strcmp(name, "cache-scanrc-ttl")) |
153 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
153 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
154 | else if (!strcmp(name, "cache-static-ttl")) |
154 | else if (!strcmp(name, "cache-static-ttl")) |
155 | ctx.cfg.cache_static_ttl = atoi(value); |
155 | ctx.cfg.cache_static_ttl = atoi(value); |
156 | else if (!strcmp(name, "cache-dynamic-ttl")) |
156 | else if (!strcmp(name, "cache-dynamic-ttl")) |
157 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
157 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
158 | else if (!strcmp(name, "about-filter")) |
158 | else if (!strcmp(name, "about-filter")) |
159 | ctx.cfg.about_filter = new_filter(value, 0); |
159 | ctx.cfg.about_filter = new_filter(value, 0); |
160 | else if (!strcmp(name, "commit-filter")) |
160 | else if (!strcmp(name, "commit-filter")) |
161 | ctx.cfg.commit_filter = new_filter(value, 0); |
161 | ctx.cfg.commit_filter = new_filter(value, 0); |
162 | else if (!strcmp(name, "embedded")) |
162 | else if (!strcmp(name, "embedded")) |
163 | ctx.cfg.embedded = atoi(value); |
163 | ctx.cfg.embedded = atoi(value); |
164 | else if (!strcmp(name, "max-message-length")) |
164 | else if (!strcmp(name, "max-message-length")) |
165 | ctx.cfg.max_msg_len = atoi(value); |
165 | ctx.cfg.max_msg_len = atoi(value); |
166 | else if (!strcmp(name, "max-repodesc-length")) |
166 | else if (!strcmp(name, "max-repodesc-length")) |
167 | ctx.cfg.max_repodesc_len = atoi(value); |
167 | ctx.cfg.max_repodesc_len = atoi(value); |
168 | else if (!strcmp(name, "max-blob-size")) |
168 | else if (!strcmp(name, "max-blob-size")) |
169 | ctx.cfg.max_blob_size = atoi(value); |
169 | ctx.cfg.max_blob_size = atoi(value); |
170 | else if (!strcmp(name, "max-repo-count")) |
170 | else if (!strcmp(name, "max-repo-count")) |
171 | ctx.cfg.max_repo_count = atoi(value); |
171 | ctx.cfg.max_repo_count = atoi(value); |
172 | else if (!strcmp(name, "max-commit-count")) |
172 | else if (!strcmp(name, "max-commit-count")) |
173 | ctx.cfg.max_commit_count = atoi(value); |
173 | ctx.cfg.max_commit_count = atoi(value); |
174 | else if (!strcmp(name, "scan-path")) |
174 | else if (!strcmp(name, "scan-path")) |
175 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
175 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
176 | process_cached_repolist(value); |
176 | process_cached_repolist(value); |
177 | else |
177 | else |
178 | scan_tree(value, repo_config); |
178 | scan_tree(value, repo_config); |
179 | else if (!strcmp(name, "source-filter")) |
179 | else if (!strcmp(name, "source-filter")) |
180 | ctx.cfg.source_filter = new_filter(value, 1); |
180 | ctx.cfg.source_filter = new_filter(value, 1); |
181 | else if (!strcmp(name, "summary-log")) |
181 | else if (!strcmp(name, "summary-log")) |
182 | ctx.cfg.summary_log = atoi(value); |
182 | ctx.cfg.summary_log = atoi(value); |
183 | else if (!strcmp(name, "summary-branches")) |
183 | else if (!strcmp(name, "summary-branches")) |
184 | ctx.cfg.summary_branches = atoi(value); |
184 | ctx.cfg.summary_branches = atoi(value); |
185 | else if (!strcmp(name, "summary-tags")) |
185 | else if (!strcmp(name, "summary-tags")) |
186 | ctx.cfg.summary_tags = atoi(value); |
186 | ctx.cfg.summary_tags = atoi(value); |
| |
187 | else if (!strcmp(name, "side-by-side-diffs")) |
| |
188 | ctx.cfg.ssdiff = atoi(value); |
187 | else if (!strcmp(name, "agefile")) |
189 | else if (!strcmp(name, "agefile")) |
188 | ctx.cfg.agefile = xstrdup(value); |
190 | ctx.cfg.agefile = xstrdup(value); |
189 | else if (!strcmp(name, "renamelimit")) |
191 | else if (!strcmp(name, "renamelimit")) |
190 | ctx.cfg.renamelimit = atoi(value); |
192 | ctx.cfg.renamelimit = atoi(value); |
191 | else if (!strcmp(name, "robots")) |
193 | else if (!strcmp(name, "robots")) |
192 | ctx.cfg.robots = xstrdup(value); |
194 | ctx.cfg.robots = xstrdup(value); |
193 | else if (!strcmp(name, "clone-prefix")) |
195 | else if (!strcmp(name, "clone-prefix")) |
194 | ctx.cfg.clone_prefix = xstrdup(value); |
196 | ctx.cfg.clone_prefix = xstrdup(value); |
195 | else if (!strcmp(name, "local-time")) |
197 | else if (!strcmp(name, "local-time")) |
196 | ctx.cfg.local_time = atoi(value); |
198 | ctx.cfg.local_time = atoi(value); |
197 | else if (!prefixcmp(name, "mimetype.")) |
199 | else if (!prefixcmp(name, "mimetype.")) |
198 | add_mimetype(name + 9, value); |
200 | add_mimetype(name + 9, value); |
199 | else if (!strcmp(name, "include")) |
201 | else if (!strcmp(name, "include")) |
200 | parse_configfile(value, config_cb); |
202 | parse_configfile(value, config_cb); |
201 | } |
203 | } |
202 | |
204 | |
203 | static void querystring_cb(const char *name, const char *value) |
205 | static void querystring_cb(const char *name, const char *value) |
204 | { |
206 | { |
205 | if (!value) |
207 | if (!value) |
206 | value = ""; |
208 | value = ""; |
207 | |
209 | |
208 | if (!strcmp(name,"r")) { |
210 | if (!strcmp(name,"r")) { |
209 | ctx.qry.repo = xstrdup(value); |
211 | ctx.qry.repo = xstrdup(value); |
210 | ctx.repo = cgit_get_repoinfo(value); |
212 | ctx.repo = cgit_get_repoinfo(value); |
211 | } else if (!strcmp(name, "p")) { |
213 | } else if (!strcmp(name, "p")) { |
212 | ctx.qry.page = xstrdup(value); |
214 | ctx.qry.page = xstrdup(value); |
213 | } else if (!strcmp(name, "url")) { |
215 | } else if (!strcmp(name, "url")) { |
214 | if (*value == '/') |
216 | if (*value == '/') |
215 | value++; |
217 | value++; |
216 | ctx.qry.url = xstrdup(value); |
218 | ctx.qry.url = xstrdup(value); |
217 | cgit_parse_url(value); |
219 | cgit_parse_url(value); |
218 | } else if (!strcmp(name, "qt")) { |
220 | } else if (!strcmp(name, "qt")) { |
219 | ctx.qry.grep = xstrdup(value); |
221 | ctx.qry.grep = xstrdup(value); |
220 | } else if (!strcmp(name, "q")) { |
222 | } else if (!strcmp(name, "q")) { |
221 | ctx.qry.search = xstrdup(value); |
223 | ctx.qry.search = xstrdup(value); |
222 | } else if (!strcmp(name, "h")) { |
224 | } else if (!strcmp(name, "h")) { |
223 | ctx.qry.head = xstrdup(value); |
225 | ctx.qry.head = xstrdup(value); |
224 | ctx.qry.has_symref = 1; |
226 | ctx.qry.has_symref = 1; |
225 | } else if (!strcmp(name, "id")) { |
227 | } else if (!strcmp(name, "id")) { |
226 | ctx.qry.sha1 = xstrdup(value); |
228 | ctx.qry.sha1 = xstrdup(value); |
227 | ctx.qry.has_sha1 = 1; |
229 | ctx.qry.has_sha1 = 1; |
228 | } else if (!strcmp(name, "id2")) { |
230 | } else if (!strcmp(name, "id2")) { |
229 | ctx.qry.sha2 = xstrdup(value); |
231 | ctx.qry.sha2 = xstrdup(value); |
230 | ctx.qry.has_sha1 = 1; |
232 | ctx.qry.has_sha1 = 1; |
231 | } else if (!strcmp(name, "ofs")) { |
233 | } else if (!strcmp(name, "ofs")) { |
232 | ctx.qry.ofs = atoi(value); |
234 | ctx.qry.ofs = atoi(value); |
233 | } else if (!strcmp(name, "path")) { |
235 | } else if (!strcmp(name, "path")) { |
234 | ctx.qry.path = trim_end(value, '/'); |
236 | ctx.qry.path = trim_end(value, '/'); |
235 | } else if (!strcmp(name, "name")) { |
237 | } else if (!strcmp(name, "name")) { |
236 | ctx.qry.name = xstrdup(value); |
238 | ctx.qry.name = xstrdup(value); |
237 | } else if (!strcmp(name, "mimetype")) { |
239 | } else if (!strcmp(name, "mimetype")) { |
238 | ctx.qry.mimetype = xstrdup(value); |
240 | ctx.qry.mimetype = xstrdup(value); |
239 | } else if (!strcmp(name, "s")){ |
241 | } else if (!strcmp(name, "s")){ |
240 | ctx.qry.sort = xstrdup(value); |
242 | ctx.qry.sort = xstrdup(value); |
241 | } else if (!strcmp(name, "showmsg")) { |
243 | } else if (!strcmp(name, "showmsg")) { |
242 | ctx.qry.showmsg = atoi(value); |
244 | ctx.qry.showmsg = atoi(value); |
243 | } else if (!strcmp(name, "period")) { |
245 | } else if (!strcmp(name, "period")) { |
244 | ctx.qry.period = xstrdup(value); |
246 | ctx.qry.period = xstrdup(value); |
| |
247 | } else if (!strcmp(name, "ss")) { |
| |
248 | ctx.qry.ssdiff = atoi(value); |
245 | } |
249 | } |
246 | } |
250 | } |
247 | |
251 | |
248 | char *xstrdupn(const char *str) |
252 | char *xstrdupn(const char *str) |
249 | { |
253 | { |
250 | return (str ? xstrdup(str) : NULL); |
254 | return (str ? xstrdup(str) : NULL); |
251 | } |
255 | } |
252 | |
256 | |
253 | static void prepare_context(struct cgit_context *ctx) |
257 | static void prepare_context(struct cgit_context *ctx) |
254 | { |
258 | { |
255 | memset(ctx, 0, sizeof(ctx)); |
259 | memset(ctx, 0, sizeof(ctx)); |
256 | ctx->cfg.agefile = "info/web/last-modified"; |
260 | ctx->cfg.agefile = "info/web/last-modified"; |
257 | ctx->cfg.nocache = 0; |
261 | ctx->cfg.nocache = 0; |
258 | ctx->cfg.cache_size = 0; |
262 | ctx->cfg.cache_size = 0; |
259 | ctx->cfg.cache_dynamic_ttl = 5; |
263 | ctx->cfg.cache_dynamic_ttl = 5; |
260 | ctx->cfg.cache_max_create_time = 5; |
264 | ctx->cfg.cache_max_create_time = 5; |
261 | ctx->cfg.cache_repo_ttl = 5; |
265 | ctx->cfg.cache_repo_ttl = 5; |
262 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
266 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
263 | ctx->cfg.cache_root_ttl = 5; |
267 | ctx->cfg.cache_root_ttl = 5; |
264 | ctx->cfg.cache_scanrc_ttl = 15; |
268 | ctx->cfg.cache_scanrc_ttl = 15; |
265 | ctx->cfg.cache_static_ttl = -1; |
269 | ctx->cfg.cache_static_ttl = -1; |
266 | ctx->cfg.css = "/cgit.css"; |
270 | ctx->cfg.css = "/cgit.css"; |
267 | ctx->cfg.logo = "/cgit.png"; |
271 | ctx->cfg.logo = "/cgit.png"; |
268 | ctx->cfg.local_time = 0; |
272 | ctx->cfg.local_time = 0; |
269 | ctx->cfg.enable_tree_linenumbers = 1; |
273 | ctx->cfg.enable_tree_linenumbers = 1; |
270 | ctx->cfg.max_repo_count = 50; |
274 | ctx->cfg.max_repo_count = 50; |
271 | ctx->cfg.max_commit_count = 50; |
275 | ctx->cfg.max_commit_count = 50; |
272 | ctx->cfg.max_lock_attempts = 5; |
276 | ctx->cfg.max_lock_attempts = 5; |
273 | ctx->cfg.max_msg_len = 80; |
277 | ctx->cfg.max_msg_len = 80; |
274 | ctx->cfg.max_repodesc_len = 80; |
278 | ctx->cfg.max_repodesc_len = 80; |
275 | ctx->cfg.max_blob_size = 0; |
279 | ctx->cfg.max_blob_size = 0; |
276 | ctx->cfg.max_stats = 0; |
280 | ctx->cfg.max_stats = 0; |
277 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
281 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
278 | ctx->cfg.renamelimit = -1; |
282 | ctx->cfg.renamelimit = -1; |
279 | ctx->cfg.robots = "index, nofollow"; |
283 | ctx->cfg.robots = "index, nofollow"; |
280 | ctx->cfg.root_title = "Git repository browser"; |
284 | ctx->cfg.root_title = "Git repository browser"; |
281 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
285 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
282 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
286 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
283 | ctx->cfg.section = ""; |
287 | ctx->cfg.section = ""; |
284 | ctx->cfg.summary_branches = 10; |
288 | ctx->cfg.summary_branches = 10; |
285 | ctx->cfg.summary_log = 10; |
289 | ctx->cfg.summary_log = 10; |
286 | ctx->cfg.summary_tags = 10; |
290 | ctx->cfg.summary_tags = 10; |
| |
291 | ctx->cfg.ssdiff = 0; |
287 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
292 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
288 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
293 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
289 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
294 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
290 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
295 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
291 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
296 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
292 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
297 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
293 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
298 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
294 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
299 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
295 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
300 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
296 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
301 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
297 | ctx->page.mimetype = "text/html"; |
302 | ctx->page.mimetype = "text/html"; |
298 | ctx->page.charset = PAGE_ENCODING; |
303 | ctx->page.charset = PAGE_ENCODING; |
299 | ctx->page.filename = NULL; |
304 | ctx->page.filename = NULL; |
300 | ctx->page.size = 0; |
305 | ctx->page.size = 0; |
301 | ctx->page.modified = time(NULL); |
306 | ctx->page.modified = time(NULL); |
302 | ctx->page.expires = ctx->page.modified; |
307 | ctx->page.expires = ctx->page.modified; |
303 | ctx->page.etag = NULL; |
308 | ctx->page.etag = NULL; |
304 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
309 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
305 | if (ctx->env.script_name) |
310 | if (ctx->env.script_name) |
306 | ctx->cfg.script_name = ctx->env.script_name; |
311 | ctx->cfg.script_name = ctx->env.script_name; |
307 | if (ctx->env.query_string) |
312 | if (ctx->env.query_string) |
308 | ctx->qry.raw = ctx->env.query_string; |
313 | ctx->qry.raw = ctx->env.query_string; |
309 | if (!ctx->env.cgit_config) |
314 | if (!ctx->env.cgit_config) |
310 | ctx->env.cgit_config = CGIT_CONFIG; |
315 | ctx->env.cgit_config = CGIT_CONFIG; |
311 | } |
316 | } |
312 | |
317 | |
313 | struct refmatch { |
318 | struct refmatch { |
314 | char *req_ref; |
319 | char *req_ref; |
315 | char *first_ref; |
320 | char *first_ref; |
316 | int match; |
321 | int match; |
317 | }; |
322 | }; |
318 | |
323 | |
319 | int find_current_ref(const char *refname, const unsigned char *sha1, |
324 | int find_current_ref(const char *refname, const unsigned char *sha1, |
320 | int flags, void *cb_data) |
325 | int flags, void *cb_data) |
321 | { |
326 | { |
322 | struct refmatch *info; |
327 | struct refmatch *info; |
323 | |
328 | |
324 | info = (struct refmatch *)cb_data; |
329 | info = (struct refmatch *)cb_data; |
325 | if (!strcmp(refname, info->req_ref)) |
330 | if (!strcmp(refname, info->req_ref)) |
326 | info->match = 1; |
331 | info->match = 1; |
327 | if (!info->first_ref) |
332 | if (!info->first_ref) |
328 | info->first_ref = xstrdup(refname); |
333 | info->first_ref = xstrdup(refname); |
329 | return info->match; |
334 | return info->match; |
330 | } |
335 | } |
331 | |
336 | |
332 | char *find_default_branch(struct cgit_repo *repo) |
337 | char *find_default_branch(struct cgit_repo *repo) |
333 | { |
338 | { |
334 | struct refmatch info; |
339 | struct refmatch info; |
|