| -rw-r--r-- | scan-tree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..eda8c67 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -154,34 +154,33 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) if (!stat(p, &st)) { config_fn = fn; parse_configfile(xstrdup(p), &repo_config); } } 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] == '.') { if (ent->d_name[1] == '\0') continue; if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') continue; } @@ -197,16 +196,17 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) buf, strerror(errno), errno); free(buf); continue; } if (S_ISDIR(st.st_mode)) scan_path(base, buf, fn); free(buf); } +end: closedir(dir); } #define lastc(s) s[strlen(s) - 1] void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) { char line[MAX_PATH * 2], *z; |