summaryrefslogtreecommitdiffabout
path: root/scan-tree.c
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) (unidiff)
treebef3cd4f21672a40399816dcbcab2fedf20b5f5f /scan-tree.c
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 (limited to 'scan-tree.c') (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)
156 parse_configfile(xstrdup(p), &repo_config); 156 parse_configfile(xstrdup(p), &repo_config);
157 } 157 }
158} 158}
159 159
160static void scan_path(const char *base, const char *path, repo_config_fn fn) 160static void scan_path(const char *base, const char *path, repo_config_fn fn)
161{ 161{
162 DIR *dir; 162 DIR *dir = opendir(path);
163 struct dirent *ent; 163 struct dirent *ent;
164 char *buf; 164 char *buf;
165 struct stat st; 165 struct stat st;
166 166
167 if (!dir) {
168 fprintf(stderr, "Error opening directory %s: %s (%d)\n",
169 path, strerror(errno), errno);
170 return;
171 }
167 if (is_git_dir(path)) { 172 if (is_git_dir(path)) {
168 add_repo(base, path, fn); 173 add_repo(base, path, fn);
169 return; 174 goto end;
170 } 175 }
171 if (is_git_dir(fmt("%s/.git", path))) { 176 if (is_git_dir(fmt("%s/.git", path))) {
172 add_repo(base, fmt("%s/.git", path), fn); 177 add_repo(base, fmt("%s/.git", path), fn);
173 return; 178 goto end;
174 }
175 dir = opendir(path);
176 if (!dir) {
177 fprintf(stderr, "Error opening directory %s: %s (%d)\n",
178 path, strerror(errno), errno);
179 return;
180 } 179 }
181 while((ent = readdir(dir)) != NULL) { 180 while((ent = readdir(dir)) != NULL) {
182 if (ent->d_name[0] == '.') { 181 if (ent->d_name[0] == '.') {
183 if (ent->d_name[1] == '\0') 182 if (ent->d_name[1] == '\0')
184 continue; 183 continue;
185 if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') 184 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)
199 continue; 198 continue;
200 } 199 }
201 if (S_ISDIR(st.st_mode)) 200 if (S_ISDIR(st.st_mode))
202 scan_path(base, buf, fn); 201 scan_path(base, buf, fn);
203 free(buf); 202 free(buf);
204 } 203 }
204end:
205 closedir(dir); 205 closedir(dir);
206} 206}
207 207
208#define lastc(s) s[strlen(s) - 1] 208#define lastc(s) s[strlen(s) - 1]
209 209
210void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) 210void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)