summaryrefslogtreecommitdiffabout
authorJohan Herland <johan@herland.net>2010-11-15 19:40:43 (UTC)
committer Lars Hjemli <larsh@prediktor.no>2010-11-16 08:03:43 (UTC)
commit682adbc0cad2baa1a6119013b166f52de3ee3352 (patch) (side-by-side diff)
treebef3cd4f21672a40399816dcbcab2fedf20b5f5f
parent17596459fe9a43428a261e66f65b227d15bf7ee5 (diff)
downloadcgit-682adbc0cad2baa1a6119013b166f52de3ee3352.zip
cgit-682adbc0cad2baa1a6119013b166f52de3ee3352.tar.gz
cgit-682adbc0cad2baa1a6119013b166f52de3ee3352.tar.bz2
scan_path(): Improve handling of inaccessible directories
When scanning a tree containing inaccessible directories (e.g. '.ssh' directories in users' homedirs, or repos with explicitly restricted access), scan_path() currently causes three lines of "Permissions denied" errors to be printed to the CGI error log per inaccessible directory: Error checking path /home/foo/.ssh: Permission denied (13) Error checking path /home/foo/.ssh/.git: Permission denied (13) Error opening directory /home/foo/.ssh: Permission denied (13) This is a side-effect of calling is_git_dir(path) and is_git_dir(fmt("%s/.git", path) _before_ we try to opendir(path). By placing the opendir(path) before the two is_git_dir() calls, we reduce the noise to a single line per inaccessible directory: Error opening directory /home/foo/.ssh: Permission denied (13) Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <larsh@prediktor.no>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c18
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
@@ -156,30 +156,29 @@ static void add_repo(const char *base, const char *path, repo_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')
@@ -199,12 +198,13 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
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)