|
diff --git a/cgit.c b/cgit.c index 2364d1c..f9a42bb 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -176,64 +176,66 @@ void config_cb(const char *name, const char *value) |
176 | else if (!strcmp(name, "max-repodesc-length")) |
176 | else if (!strcmp(name, "max-repodesc-length")) |
177 | ctx.cfg.max_repodesc_len = atoi(value); |
177 | ctx.cfg.max_repodesc_len = atoi(value); |
178 | else if (!strcmp(name, "max-blob-size")) |
178 | else if (!strcmp(name, "max-blob-size")) |
179 | ctx.cfg.max_blob_size = atoi(value); |
179 | ctx.cfg.max_blob_size = atoi(value); |
180 | else if (!strcmp(name, "max-repo-count")) |
180 | else if (!strcmp(name, "max-repo-count")) |
181 | ctx.cfg.max_repo_count = atoi(value); |
181 | ctx.cfg.max_repo_count = atoi(value); |
182 | else if (!strcmp(name, "max-commit-count")) |
182 | else if (!strcmp(name, "max-commit-count")) |
183 | ctx.cfg.max_commit_count = atoi(value); |
183 | ctx.cfg.max_commit_count = atoi(value); |
184 | else if (!strcmp(name, "project-list")) |
184 | else if (!strcmp(name, "project-list")) |
185 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
185 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
186 | else if (!strcmp(name, "scan-path")) |
186 | else if (!strcmp(name, "scan-path")) |
187 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
187 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
188 | process_cached_repolist(expand_macros(value)); |
188 | process_cached_repolist(expand_macros(value)); |
189 | else if (ctx.cfg.project_list) |
189 | else if (ctx.cfg.project_list) |
190 | scan_projects(expand_macros(value), |
190 | scan_projects(expand_macros(value), |
191 | ctx.cfg.project_list, repo_config); |
191 | ctx.cfg.project_list, repo_config); |
192 | else |
192 | else |
193 | scan_tree(expand_macros(value), repo_config); |
193 | scan_tree(expand_macros(value), repo_config); |
194 | else if (!strcmp(name, "source-filter")) |
194 | else if (!strcmp(name, "source-filter")) |
195 | ctx.cfg.source_filter = new_filter(value, 1); |
195 | ctx.cfg.source_filter = new_filter(value, 1); |
196 | else if (!strcmp(name, "summary-log")) |
196 | else if (!strcmp(name, "summary-log")) |
197 | ctx.cfg.summary_log = atoi(value); |
197 | ctx.cfg.summary_log = atoi(value); |
198 | else if (!strcmp(name, "summary-branches")) |
198 | else if (!strcmp(name, "summary-branches")) |
199 | ctx.cfg.summary_branches = atoi(value); |
199 | ctx.cfg.summary_branches = atoi(value); |
200 | else if (!strcmp(name, "summary-tags")) |
200 | else if (!strcmp(name, "summary-tags")) |
201 | ctx.cfg.summary_tags = atoi(value); |
201 | ctx.cfg.summary_tags = atoi(value); |
202 | else if (!strcmp(name, "side-by-side-diffs")) |
202 | else if (!strcmp(name, "side-by-side-diffs")) |
203 | ctx.cfg.ssdiff = atoi(value); |
203 | ctx.cfg.ssdiff = atoi(value); |
204 | else if (!strcmp(name, "agefile")) |
204 | else if (!strcmp(name, "agefile")) |
205 | ctx.cfg.agefile = xstrdup(value); |
205 | ctx.cfg.agefile = xstrdup(value); |
206 | else if (!strcmp(name, "renamelimit")) |
206 | else if (!strcmp(name, "renamelimit")) |
207 | ctx.cfg.renamelimit = atoi(value); |
207 | ctx.cfg.renamelimit = atoi(value); |
| |
208 | else if (!strcmp(name, "remove-suffix")) |
| |
209 | ctx.cfg.remove_suffix = atoi(value); |
208 | else if (!strcmp(name, "robots")) |
210 | else if (!strcmp(name, "robots")) |
209 | ctx.cfg.robots = xstrdup(value); |
211 | ctx.cfg.robots = xstrdup(value); |
210 | else if (!strcmp(name, "clone-prefix")) |
212 | else if (!strcmp(name, "clone-prefix")) |
211 | ctx.cfg.clone_prefix = xstrdup(value); |
213 | ctx.cfg.clone_prefix = xstrdup(value); |
212 | else if (!strcmp(name, "local-time")) |
214 | else if (!strcmp(name, "local-time")) |
213 | ctx.cfg.local_time = atoi(value); |
215 | ctx.cfg.local_time = atoi(value); |
214 | else if (!prefixcmp(name, "mimetype.")) |
216 | else if (!prefixcmp(name, "mimetype.")) |
215 | add_mimetype(name + 9, value); |
217 | add_mimetype(name + 9, value); |
216 | else if (!strcmp(name, "include")) |
218 | else if (!strcmp(name, "include")) |
217 | parse_configfile(expand_macros(value), config_cb); |
219 | parse_configfile(expand_macros(value), config_cb); |
218 | } |
220 | } |
219 | |
221 | |
220 | static void querystring_cb(const char *name, const char *value) |
222 | static void querystring_cb(const char *name, const char *value) |
221 | { |
223 | { |
222 | if (!value) |
224 | if (!value) |
223 | value = ""; |
225 | value = ""; |
224 | |
226 | |
225 | if (!strcmp(name,"r")) { |
227 | if (!strcmp(name,"r")) { |
226 | ctx.qry.repo = xstrdup(value); |
228 | ctx.qry.repo = xstrdup(value); |
227 | ctx.repo = cgit_get_repoinfo(value); |
229 | ctx.repo = cgit_get_repoinfo(value); |
228 | } else if (!strcmp(name, "p")) { |
230 | } else if (!strcmp(name, "p")) { |
229 | ctx.qry.page = xstrdup(value); |
231 | ctx.qry.page = xstrdup(value); |
230 | } else if (!strcmp(name, "url")) { |
232 | } else if (!strcmp(name, "url")) { |
231 | if (*value == '/') |
233 | if (*value == '/') |
232 | value++; |
234 | value++; |
233 | ctx.qry.url = xstrdup(value); |
235 | ctx.qry.url = xstrdup(value); |
234 | cgit_parse_url(value); |
236 | cgit_parse_url(value); |
235 | } else if (!strcmp(name, "qt")) { |
237 | } else if (!strcmp(name, "qt")) { |
236 | ctx.qry.grep = xstrdup(value); |
238 | ctx.qry.grep = xstrdup(value); |
237 | } else if (!strcmp(name, "q")) { |
239 | } else if (!strcmp(name, "q")) { |
238 | ctx.qry.search = xstrdup(value); |
240 | ctx.qry.search = xstrdup(value); |
239 | } else if (!strcmp(name, "h")) { |
241 | } else if (!strcmp(name, "h")) { |
@@ -273,64 +275,65 @@ static void querystring_cb(const char *name, const char *value) |
273 | char *xstrdupn(const char *str) |
275 | char *xstrdupn(const char *str) |
274 | { |
276 | { |
275 | return (str ? xstrdup(str) : NULL); |
277 | return (str ? xstrdup(str) : NULL); |
276 | } |
278 | } |
277 | |
279 | |
278 | static void prepare_context(struct cgit_context *ctx) |
280 | static void prepare_context(struct cgit_context *ctx) |
279 | { |
281 | { |
280 | memset(ctx, 0, sizeof(*ctx)); |
282 | memset(ctx, 0, sizeof(*ctx)); |
281 | ctx->cfg.agefile = "info/web/last-modified"; |
283 | ctx->cfg.agefile = "info/web/last-modified"; |
282 | ctx->cfg.nocache = 0; |
284 | ctx->cfg.nocache = 0; |
283 | ctx->cfg.cache_size = 0; |
285 | ctx->cfg.cache_size = 0; |
284 | ctx->cfg.cache_dynamic_ttl = 5; |
286 | ctx->cfg.cache_dynamic_ttl = 5; |
285 | ctx->cfg.cache_max_create_time = 5; |
287 | ctx->cfg.cache_max_create_time = 5; |
286 | ctx->cfg.cache_repo_ttl = 5; |
288 | ctx->cfg.cache_repo_ttl = 5; |
287 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
289 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
288 | ctx->cfg.cache_root_ttl = 5; |
290 | ctx->cfg.cache_root_ttl = 5; |
289 | ctx->cfg.cache_scanrc_ttl = 15; |
291 | ctx->cfg.cache_scanrc_ttl = 15; |
290 | ctx->cfg.cache_static_ttl = -1; |
292 | ctx->cfg.cache_static_ttl = -1; |
291 | ctx->cfg.css = "/cgit.css"; |
293 | ctx->cfg.css = "/cgit.css"; |
292 | ctx->cfg.logo = "/cgit.png"; |
294 | ctx->cfg.logo = "/cgit.png"; |
293 | ctx->cfg.local_time = 0; |
295 | ctx->cfg.local_time = 0; |
294 | ctx->cfg.enable_tree_linenumbers = 1; |
296 | ctx->cfg.enable_tree_linenumbers = 1; |
295 | ctx->cfg.max_repo_count = 50; |
297 | ctx->cfg.max_repo_count = 50; |
296 | ctx->cfg.max_commit_count = 50; |
298 | ctx->cfg.max_commit_count = 50; |
297 | ctx->cfg.max_lock_attempts = 5; |
299 | ctx->cfg.max_lock_attempts = 5; |
298 | ctx->cfg.max_msg_len = 80; |
300 | ctx->cfg.max_msg_len = 80; |
299 | ctx->cfg.max_repodesc_len = 80; |
301 | ctx->cfg.max_repodesc_len = 80; |
300 | ctx->cfg.max_blob_size = 0; |
302 | ctx->cfg.max_blob_size = 0; |
301 | ctx->cfg.max_stats = 0; |
303 | ctx->cfg.max_stats = 0; |
302 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
304 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
303 | ctx->cfg.project_list = NULL; |
305 | ctx->cfg.project_list = NULL; |
304 | ctx->cfg.renamelimit = -1; |
306 | ctx->cfg.renamelimit = -1; |
| |
307 | ctx->cfg.remove_suffix = 0; |
305 | ctx->cfg.robots = "index, nofollow"; |
308 | ctx->cfg.robots = "index, nofollow"; |
306 | ctx->cfg.root_title = "Git repository browser"; |
309 | ctx->cfg.root_title = "Git repository browser"; |
307 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
310 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
308 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
311 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
309 | ctx->cfg.section = ""; |
312 | ctx->cfg.section = ""; |
310 | ctx->cfg.summary_branches = 10; |
313 | ctx->cfg.summary_branches = 10; |
311 | ctx->cfg.summary_log = 10; |
314 | ctx->cfg.summary_log = 10; |
312 | ctx->cfg.summary_tags = 10; |
315 | ctx->cfg.summary_tags = 10; |
313 | ctx->cfg.max_atom_items = 10; |
316 | ctx->cfg.max_atom_items = 10; |
314 | ctx->cfg.ssdiff = 0; |
317 | ctx->cfg.ssdiff = 0; |
315 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
318 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
316 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
319 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
317 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
320 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
318 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
321 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
319 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
322 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
320 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
323 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
321 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
324 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
322 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
325 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
323 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
326 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
324 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
327 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
325 | ctx->page.mimetype = "text/html"; |
328 | ctx->page.mimetype = "text/html"; |
326 | ctx->page.charset = PAGE_ENCODING; |
329 | ctx->page.charset = PAGE_ENCODING; |
327 | ctx->page.filename = NULL; |
330 | ctx->page.filename = NULL; |
328 | ctx->page.size = 0; |
331 | ctx->page.size = 0; |
329 | ctx->page.modified = time(NULL); |
332 | ctx->page.modified = time(NULL); |
330 | ctx->page.expires = ctx->page.modified; |
333 | ctx->page.expires = ctx->page.modified; |
331 | ctx->page.etag = NULL; |
334 | ctx->page.etag = NULL; |
332 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
335 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
333 | if (ctx->env.script_name) |
336 | if (ctx->env.script_name) |
334 | ctx->cfg.script_name = ctx->env.script_name; |
337 | ctx->cfg.script_name = ctx->env.script_name; |
335 | if (ctx->env.query_string) |
338 | if (ctx->env.query_string) |
336 | ctx->qry.raw = ctx->env.query_string; |
339 | ctx->qry.raw = ctx->env.query_string; |
|