diff options
Diffstat (limited to '')
| -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 @@ -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);  } | 
