Diff options
| author | Lars Hjemli <hjemli@gmail.com> | |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | |
| commit | ||
| parent | ||
| parent | ||
| tree | ||
| download | ||
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 | |
| -rw-r--r-- | cgit.h | 1 | |
| -rw-r--r-- | cgitrc.5.txt | 8 | |
| -rw-r--r-- | scan-tree.c | 20 |
4 files changed, 23 insertions, 9 deletions
@@ -199,6 +199,8 @@ void config_cb(const char *name, const char *value) ctx.cfg.project_list, repo_config); else 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")) ctx.cfg.section_from_path = atoi(value); else if (!strcmp(name, "source-filter")) @@ -319,6 +321,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.robots = "index, nofollow"; ctx->cfg.root_title = "Git repository browser"; 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.section = ""; ctx->cfg.summary_branches = 10; @@ -210,6 +210,7 @@ struct cgit_config { int noheader; int renamelimit; int remove_suffix; + int scan_hidden_path; int section_from_path; int snapshots; int summary_branches; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 3c20fe1..a832830 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -274,6 +274,14 @@ root-title:: Text printed as heading on the repository index page. Default value: "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:: 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 diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -159,24 +159,23 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) static void scan_path(const char *base, const char *path, repo_config_fn fn) { - DIR *dir; + DIR *dir = opendir(path); struct dirent *ent; char *buf; struct stat st; + if (!dir) { + fprintf(stderr, "Error opening directory %s: %s (%d)\n", + path, strerror(errno), errno); + return; + } if (is_git_dir(path)) { add_repo(base, path, fn); - return; + goto end; } if (is_git_dir(fmt("%s/.git", path))) { add_repo(base, fmt("%s/.git", path), fn); - return; - } - dir = opendir(path); - if (!dir) { - fprintf(stderr, "Error opening directory %s: %s (%d)\n", - path, strerror(errno), errno); - return; + goto end; } while((ent = readdir(dir)) != NULL) { if (ent->d_name[0] == '.') { @@ -184,6 +183,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) continue; if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') continue; + if (!ctx.cfg.scan_hidden_path) + continue; } buf = malloc(strlen(path) + strlen(ent->d_name) + 2); if (!buf) { @@ -202,6 +203,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) scan_path(base, buf, fn); free(buf); } +end: closedir(dir); } |