| 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) (side-by-side diff) | |
| tree | bc0b99adcce3a19f127e6eb2509585ed9486831e /scan-tree.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-- | scan-tree.c | 20 |
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 @@ -161,3 +161,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) { - DIR *dir; + DIR *dir = opendir(path); struct dirent *ent; @@ -166,5 +166,10 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) + 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; } @@ -172,9 +177,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) 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; } @@ -186,2 +185,4 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) continue; + if (!ctx.cfg.scan_hidden_path) + continue; } @@ -204,2 +205,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) } +end: closedir(dir); |