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
@@ -178,48 +178,50 @@ void config_cb(const char *name, const char *value) | |||
178 | else if (!strcmp(name, "embedded")) | 178 | else if (!strcmp(name, "embedded")) |
179 | ctx.cfg.embedded = atoi(value); | 179 | ctx.cfg.embedded = atoi(value); |
180 | else if (!strcmp(name, "max-atom-items")) | 180 | else if (!strcmp(name, "max-atom-items")) |
181 | ctx.cfg.max_atom_items = atoi(value); | 181 | ctx.cfg.max_atom_items = atoi(value); |
182 | else if (!strcmp(name, "max-message-length")) | 182 | else if (!strcmp(name, "max-message-length")) |
183 | ctx.cfg.max_msg_len = atoi(value); | 183 | ctx.cfg.max_msg_len = atoi(value); |
184 | else if (!strcmp(name, "max-repodesc-length")) | 184 | else if (!strcmp(name, "max-repodesc-length")) |
185 | ctx.cfg.max_repodesc_len = atoi(value); | 185 | ctx.cfg.max_repodesc_len = atoi(value); |
186 | else if (!strcmp(name, "max-blob-size")) | 186 | else if (!strcmp(name, "max-blob-size")) |
187 | ctx.cfg.max_blob_size = atoi(value); | 187 | ctx.cfg.max_blob_size = atoi(value); |
188 | else if (!strcmp(name, "max-repo-count")) | 188 | else if (!strcmp(name, "max-repo-count")) |
189 | ctx.cfg.max_repo_count = atoi(value); | 189 | ctx.cfg.max_repo_count = atoi(value); |
190 | else if (!strcmp(name, "max-commit-count")) | 190 | else if (!strcmp(name, "max-commit-count")) |
191 | ctx.cfg.max_commit_count = atoi(value); | 191 | ctx.cfg.max_commit_count = atoi(value); |
192 | else if (!strcmp(name, "project-list")) | 192 | else if (!strcmp(name, "project-list")) |
193 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 193 | ctx.cfg.project_list = xstrdup(expand_macros(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); |
210 | else if (!strcmp(name, "summary-tags")) | 212 | else if (!strcmp(name, "summary-tags")) |
211 | ctx.cfg.summary_tags = atoi(value); | 213 | ctx.cfg.summary_tags = atoi(value); |
212 | else if (!strcmp(name, "side-by-side-diffs")) | 214 | else if (!strcmp(name, "side-by-side-diffs")) |
213 | ctx.cfg.ssdiff = atoi(value); | 215 | ctx.cfg.ssdiff = atoi(value); |
214 | else if (!strcmp(name, "agefile")) | 216 | else if (!strcmp(name, "agefile")) |
215 | ctx.cfg.agefile = xstrdup(value); | 217 | ctx.cfg.agefile = xstrdup(value); |
216 | else if (!strcmp(name, "renamelimit")) | 218 | else if (!strcmp(name, "renamelimit")) |
217 | ctx.cfg.renamelimit = atoi(value); | 219 | ctx.cfg.renamelimit = atoi(value); |
218 | else if (!strcmp(name, "remove-suffix")) | 220 | else if (!strcmp(name, "remove-suffix")) |
219 | ctx.cfg.remove_suffix = atoi(value); | 221 | ctx.cfg.remove_suffix = atoi(value); |
220 | else if (!strcmp(name, "robots")) | 222 | else if (!strcmp(name, "robots")) |
221 | ctx.cfg.robots = xstrdup(value); | 223 | ctx.cfg.robots = xstrdup(value); |
222 | else if (!strcmp(name, "clone-prefix")) | 224 | else if (!strcmp(name, "clone-prefix")) |
223 | ctx.cfg.clone_prefix = xstrdup(value); | 225 | ctx.cfg.clone_prefix = xstrdup(value); |
224 | else if (!strcmp(name, "local-time")) | 226 | else if (!strcmp(name, "local-time")) |
225 | ctx.cfg.local_time = atoi(value); | 227 | ctx.cfg.local_time = atoi(value); |
@@ -298,48 +300,49 @@ static void prepare_context(struct cgit_context *ctx) | |||
298 | ctx->cfg.cache_repo_ttl = 5; | 300 | ctx->cfg.cache_repo_ttl = 5; |
299 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 301 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
300 | ctx->cfg.cache_root_ttl = 5; | 302 | ctx->cfg.cache_root_ttl = 5; |
301 | ctx->cfg.cache_scanrc_ttl = 15; | 303 | ctx->cfg.cache_scanrc_ttl = 15; |
302 | ctx->cfg.cache_static_ttl = -1; | 304 | ctx->cfg.cache_static_ttl = -1; |
303 | ctx->cfg.css = "/cgit.css"; | 305 | ctx->cfg.css = "/cgit.css"; |
304 | ctx->cfg.logo = "/cgit.png"; | 306 | ctx->cfg.logo = "/cgit.png"; |
305 | ctx->cfg.local_time = 0; | 307 | ctx->cfg.local_time = 0; |
306 | ctx->cfg.enable_gitweb_owner = 1; | 308 | ctx->cfg.enable_gitweb_owner = 1; |
307 | ctx->cfg.enable_tree_linenumbers = 1; | 309 | ctx->cfg.enable_tree_linenumbers = 1; |
308 | ctx->cfg.max_repo_count = 50; | 310 | ctx->cfg.max_repo_count = 50; |
309 | ctx->cfg.max_commit_count = 50; | 311 | ctx->cfg.max_commit_count = 50; |
310 | ctx->cfg.max_lock_attempts = 5; | 312 | ctx->cfg.max_lock_attempts = 5; |
311 | ctx->cfg.max_msg_len = 80; | 313 | ctx->cfg.max_msg_len = 80; |
312 | ctx->cfg.max_repodesc_len = 80; | 314 | ctx->cfg.max_repodesc_len = 80; |
313 | ctx->cfg.max_blob_size = 0; | 315 | ctx->cfg.max_blob_size = 0; |
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")); |
330 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 333 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
331 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 334 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
332 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 335 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
333 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 336 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
334 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 337 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
335 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 338 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
336 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 339 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
337 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 340 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
338 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 341 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
339 | ctx->page.mimetype = "text/html"; | 342 | ctx->page.mimetype = "text/html"; |
340 | ctx->page.charset = PAGE_ENCODING; | 343 | ctx->page.charset = PAGE_ENCODING; |
341 | ctx->page.filename = NULL; | 344 | ctx->page.filename = NULL; |
342 | ctx->page.size = 0; | 345 | ctx->page.size = 0; |
343 | ctx->page.modified = time(NULL); | 346 | ctx->page.modified = time(NULL); |
344 | ctx->page.expires = ctx->page.modified; | 347 | ctx->page.expires = ctx->page.modified; |
345 | ctx->page.etag = NULL; | 348 | ctx->page.etag = NULL; |