Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/scan-tree.c b/scan-tree.c index e5a4baf..a0e09ce 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -159,23 +159,24 @@ 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 = opendir(path); + DIR *dir; 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); - goto end; + return; } if (is_git_dir(fmt("%s/.git", path))) { add_repo(base, fmt("%s/.git", path), fn); - goto end; + return; + } + dir = opendir(path); + if (!dir) { + fprintf(stderr, "Error opening directory %s: %s (%d)\n", + path, strerror(errno), errno); + return; } while((ent = readdir(dir)) != NULL) { if (ent->d_name[0] == '.') { @@ -183,8 +184,6 @@ 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) { @@ -203,7 +202,6 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) scan_path(base, buf, fn); free(buf); } -end: closedir(dir); } @@ -219,7 +217,6 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn if (!projects) { fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", projectsfile, strerror(errno), errno); - return; } while (fgets(line, sizeof(line), projects) != NULL) { for (z = &lastc(line); |