author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
commit | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (patch) (unidiff) | |
tree | bc0b99adcce3a19f127e6eb2509585ed9486831e /cgit.c | |
parent | 31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (diff) | |
parent | df522794c38934be3229a11e0e2432a1f2a3bc8d (diff) | |
download | cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.zip cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.gz cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.bz2 |
Merge branch 'jh/scan-path'
* jh/scan-path:
scan_path(): Do not recurse into hidden directories by default
scan_path(): Improve handling of inaccessible directories
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -194,16 +194,18 @@ void config_cb(const char *name, const char *value) | |||
194 | else if (!strcmp(name, "scan-path")) | 194 | else if (!strcmp(name, "scan-path")) |
195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
196 | process_cached_repolist(expand_macros(value)); | 196 | process_cached_repolist(expand_macros(value)); |
197 | else if (ctx.cfg.project_list) | 197 | else if (ctx.cfg.project_list) |
198 | scan_projects(expand_macros(value), | 198 | scan_projects(expand_macros(value), |
199 | ctx.cfg.project_list, repo_config); | 199 | ctx.cfg.project_list, repo_config); |
200 | else | 200 | else |
201 | scan_tree(expand_macros(value), repo_config); | 201 | scan_tree(expand_macros(value), repo_config); |
202 | else if (!strcmp(name, "scan-hidden-path")) | ||
203 | ctx.cfg.scan_hidden_path = atoi(value); | ||
202 | else if (!strcmp(name, "section-from-path")) | 204 | else if (!strcmp(name, "section-from-path")) |
203 | ctx.cfg.section_from_path = atoi(value); | 205 | ctx.cfg.section_from_path = atoi(value); |
204 | else if (!strcmp(name, "source-filter")) | 206 | else if (!strcmp(name, "source-filter")) |
205 | ctx.cfg.source_filter = new_filter(value, 1); | 207 | ctx.cfg.source_filter = new_filter(value, 1); |
206 | else if (!strcmp(name, "summary-log")) | 208 | else if (!strcmp(name, "summary-log")) |
207 | ctx.cfg.summary_log = atoi(value); | 209 | ctx.cfg.summary_log = atoi(value); |
208 | else if (!strcmp(name, "summary-branches")) | 210 | else if (!strcmp(name, "summary-branches")) |
209 | ctx.cfg.summary_branches = atoi(value); | 211 | ctx.cfg.summary_branches = atoi(value); |
@@ -314,16 +316,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
314 | ctx->cfg.max_stats = 0; | 316 | ctx->cfg.max_stats = 0; |
315 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 317 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
316 | ctx->cfg.project_list = NULL; | 318 | ctx->cfg.project_list = NULL; |
317 | ctx->cfg.renamelimit = -1; | 319 | ctx->cfg.renamelimit = -1; |
318 | ctx->cfg.remove_suffix = 0; | 320 | ctx->cfg.remove_suffix = 0; |
319 | ctx->cfg.robots = "index, nofollow"; | 321 | ctx->cfg.robots = "index, nofollow"; |
320 | ctx->cfg.root_title = "Git repository browser"; | 322 | ctx->cfg.root_title = "Git repository browser"; |
321 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 323 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
324 | ctx->cfg.scan_hidden_path = 0; | ||
322 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 325 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
323 | ctx->cfg.section = ""; | 326 | ctx->cfg.section = ""; |
324 | ctx->cfg.summary_branches = 10; | 327 | ctx->cfg.summary_branches = 10; |
325 | ctx->cfg.summary_log = 10; | 328 | ctx->cfg.summary_log = 10; |
326 | ctx->cfg.summary_tags = 10; | 329 | ctx->cfg.summary_tags = 10; |
327 | ctx->cfg.max_atom_items = 10; | 330 | ctx->cfg.max_atom_items = 10; |
328 | ctx->cfg.ssdiff = 0; | 331 | ctx->cfg.ssdiff = 0; |
329 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 332 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |