aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hjemli <larsh@prediktor.no>2010-11-16 09:04:31 +0100
committerLars Hjemli <larsh@prediktor.no>2010-11-16 09:04:31 +0100
commit91c8dfe9e8a3abb281e186cf5e5a4ec5d0cc94ab (patch)
treec0545e35585bf9832d53fcb40e25e15c02f3b513
parentMerge branch 'jh/graph' into wip (diff)
parentscan_path(): Do not recurse into hidden directories by default (diff)
downloadcgit-origin/wip.tar.gz
Merge branch 'jh/scan-path' into wiporigin/wip
-rw-r--r--cgit.c3
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt8
-rw-r--r--scan-tree.c20
4 files changed, 23 insertions, 9 deletions
diff --git a/cgit.c b/cgit.c
index e3e85b9..06e2a9f 100644
--- a/cgit.c
+++ b/cgit.c
@@ -201,6 +201,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-path-hidden"))
+ ctx.cfg.scan_path_hidden = atoi(value);
else if (!strcmp(name, "section-from-path"))
ctx.cfg.section_from_path = atoi(value);
else if (!strcmp(name, "source-filter"))
@@ -322,6 +324,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_path_hidden = 0;
ctx->cfg.script_name = CGIT_SCRIPT_NAME;
ctx->cfg.section = "";
ctx->cfg.summary_branches = 10;
diff --git a/cgit.h b/cgit.h
index b684e69..40fbffa 100644
--- a/cgit.h
+++ b/cgit.h
@@ -211,6 +211,7 @@ struct cgit_config {
int noheader;
int renamelimit;
int remove_suffix;
+ int scan_path_hidden;
int section_from_path;
int snapshots;
int summary_branches;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7454e94..ffeb501 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -286,6 +286,14 @@ scan-path::
project-list. Default value: none. See also: cache-scanrc-ttl,
project-list.
+scan-path-hidden::
+ 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.
+
section::
The name of the current repository section - all repositories defined
after this option will inherit the current section name. Default value:
diff --git a/scan-tree.c b/scan-tree.c
index a0e09ce..5acf9da 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_path_hidden)
+ 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);
}