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>
This commit is contained in:
والد
17596459fe
کامیت
682adbc0ca
20
scan-tree.c
20
scan-tree.c
@ -159,25 +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)
|
static void scan_path(const char *base, const char *path, repo_config_fn fn)
|
||||||
{
|
{
|
||||||
DIR *dir;
|
DIR *dir = opendir(path);
|
||||||
struct dirent *ent;
|
struct dirent *ent;
|
||||||
char *buf;
|
char *buf;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
||||||
if (is_git_dir(path)) {
|
|
||||||
add_repo(base, path, fn);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (is_git_dir(fmt("%s/.git", path))) {
|
|
||||||
add_repo(base, fmt("%s/.git", path), fn);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
dir = opendir(path);
|
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
fprintf(stderr, "Error opening directory %s: %s (%d)\n",
|
fprintf(stderr, "Error opening directory %s: %s (%d)\n",
|
||||||
path, strerror(errno), errno);
|
path, strerror(errno), errno);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (is_git_dir(path)) {
|
||||||
|
add_repo(base, path, fn);
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
if (is_git_dir(fmt("%s/.git", path))) {
|
||||||
|
add_repo(base, fmt("%s/.git", path), fn);
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
while((ent = readdir(dir)) != NULL) {
|
while((ent = readdir(dir)) != NULL) {
|
||||||
if (ent->d_name[0] == '.') {
|
if (ent->d_name[0] == '.') {
|
||||||
if (ent->d_name[1] == '\0')
|
if (ent->d_name[1] == '\0')
|
||||||
@ -202,6 +201,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
|
|||||||
scan_path(base, buf, fn);
|
scan_path(base, buf, fn);
|
||||||
free(buf);
|
free(buf);
|
||||||
}
|
}
|
||||||
|
end:
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
بارگذاری…
مرجع در شماره جدید
Block a user