summaryrefslogtreecommitdiff
path: root/scan-tree.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-02-19 14:25:55 +0100
committerLars Hjemli <hjemli@gmail.com>2011-02-19 14:25:55 +0100
commitfb9e6d1594a24fe4e551fd57a9c91fd18b14806e (patch)
treebc0b99adcce3a19f127e6eb2509585ed9486831e /scan-tree.c
parent31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (diff)
parentdf522794c38934be3229a11e0e2432a1f2a3bc8d (diff)
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
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c20
1 files changed, 11 insertions, 9 deletions
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);
}