mirror of
https://git.zx2c4.com/cgit
synced 2024-11-26 10:28:42 +00:00
scan_path(): Do not recurse into hidden directories by default
Paths that start with a period ('.') are considered hidden in the Unix world. scan_path() should arguably not recurse into these directories by default. This patch makes it so, and introduces the "scan-hidden-path" config variable for overriding the new default and revert to the old behaviour (scanning _all_ directories, including hidden .directories). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <larsh@prediktor.no>
This commit is contained in:
parent
682adbc0ca
commit
df522794c3
3
cgit.c
3
cgit.c
@ -195,6 +195,8 @@ void config_cb(const char *name, const char *value)
|
|||||||
ctx.cfg.project_list, repo_config);
|
ctx.cfg.project_list, repo_config);
|
||||||
else
|
else
|
||||||
scan_tree(expand_macros(value), repo_config);
|
scan_tree(expand_macros(value), repo_config);
|
||||||
|
else if (!strcmp(name, "scan-hidden-path"))
|
||||||
|
ctx.cfg.scan_hidden_path = atoi(value);
|
||||||
else if (!strcmp(name, "section-from-path"))
|
else if (!strcmp(name, "section-from-path"))
|
||||||
ctx.cfg.section_from_path = atoi(value);
|
ctx.cfg.section_from_path = atoi(value);
|
||||||
else if (!strcmp(name, "source-filter"))
|
else if (!strcmp(name, "source-filter"))
|
||||||
@ -315,6 +317,7 @@ static void prepare_context(struct cgit_context *ctx)
|
|||||||
ctx->cfg.robots = "index, nofollow";
|
ctx->cfg.robots = "index, nofollow";
|
||||||
ctx->cfg.root_title = "Git repository browser";
|
ctx->cfg.root_title = "Git repository browser";
|
||||||
ctx->cfg.root_desc = "a fast webinterface for the git dscm";
|
ctx->cfg.root_desc = "a fast webinterface for the git dscm";
|
||||||
|
ctx->cfg.scan_hidden_path = 0;
|
||||||
ctx->cfg.script_name = CGIT_SCRIPT_NAME;
|
ctx->cfg.script_name = CGIT_SCRIPT_NAME;
|
||||||
ctx->cfg.section = "";
|
ctx->cfg.section = "";
|
||||||
ctx->cfg.summary_branches = 10;
|
ctx->cfg.summary_branches = 10;
|
||||||
|
1
cgit.h
1
cgit.h
@ -207,6 +207,7 @@ struct cgit_config {
|
|||||||
int noheader;
|
int noheader;
|
||||||
int renamelimit;
|
int renamelimit;
|
||||||
int remove_suffix;
|
int remove_suffix;
|
||||||
|
int scan_hidden_path;
|
||||||
int section_from_path;
|
int section_from_path;
|
||||||
int snapshots;
|
int snapshots;
|
||||||
int summary_branches;
|
int summary_branches;
|
||||||
|
@ -269,6 +269,14 @@ root-title::
|
|||||||
Text printed as heading on the repository index page. Default value:
|
Text printed as heading on the repository index page. Default value:
|
||||||
"Git Repository Browser".
|
"Git Repository Browser".
|
||||||
|
|
||||||
|
scan-hidden-path::
|
||||||
|
If set to "1" and scan-path is enabled, scan-path will recurse into
|
||||||
|
directories whose name starts with a period ('.'). Otherwise,
|
||||||
|
scan-path will stay away from such directories (considered as
|
||||||
|
"hidden"). Note that this does not apply to the ".git" directory in
|
||||||
|
non-bare repos. This must be defined prior to scan-path.
|
||||||
|
Default value: 0. See also: scan-path.
|
||||||
|
|
||||||
scan-path::
|
scan-path::
|
||||||
A path which will be scanned for repositories. If caching is enabled,
|
A path which will be scanned for repositories. If caching is enabled,
|
||||||
the result will be cached as a cgitrc include-file in the cache
|
the result will be cached as a cgitrc include-file in the cache
|
||||||
|
@ -183,6 +183,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
|
|||||||
continue;
|
continue;
|
||||||
if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
|
if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
|
||||||
continue;
|
continue;
|
||||||
|
if (!ctx.cfg.scan_hidden_path)
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
|
buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
|
Loading…
Reference in New Issue
Block a user