aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2011-02-19 22:25:55 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2011-02-19 22:25:55 (JST)
commitfb9e6d1594a24fe4e551fd57a9c91fd18b14806e (patch)
treebc0b99adcce3a19f127e6eb2509585ed9486831e
parent31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (diff)
parentdf522794c38934be3229a11e0e2432a1f2a3bc8d (diff)
downloadcgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.zip
cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.gz
Merge branch 'jh/scan-path'
* jh/scan-path: scan_path(): Do not recurse into hidden directories by default scan_path(): Improve handling of inaccessible directories
-rw-r--r--cgit.c3
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt8
-rw-r--r--scan-tree.c20
4 files changed, 23 insertions, 9 deletions
diff --git a/cgit.c b/cgit.c
index 53ab68d..71f3fc8 100644
--- a/cgit.c
+++ b/cgit.c
@@ -199,6 +199,8 @@ void config_cb(const char *name, const char *value)
199 ctx.cfg.project_list, repo_config); 199 ctx.cfg.project_list, repo_config);
200 else 200 else
201 scan_tree(expand_macros(value), repo_config); 201 scan_tree(expand_macros(value), repo_config);
202 else if (!strcmp(name, "scan-hidden-path"))
203 ctx.cfg.scan_hidden_path = atoi(value);
202 else if (!strcmp(name, "section-from-path")) 204 else if (!strcmp(name, "section-from-path"))
203 ctx.cfg.section_from_path = atoi(value); 205 ctx.cfg.section_from_path = atoi(value);
204 else if (!strcmp(name, "source-filter")) 206 else if (!strcmp(name, "source-filter"))
@@ -319,6 +321,7 @@ static void prepare_context(struct cgit_context *ctx)
319 ctx->cfg.robots = "index, nofollow"; 321 ctx->cfg.robots = "index, nofollow";
320 ctx->cfg.root_title = "Git repository browser"; 322 ctx->cfg.root_title = "Git repository browser";
321 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 323 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
324 ctx->cfg.scan_hidden_path = 0;
322 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 325 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
323 ctx->cfg.section = ""; 326 ctx->cfg.section = "";
324 ctx->cfg.summary_branches = 10; 327 ctx->cfg.summary_branches = 10;
diff --git a/cgit.h b/cgit.h
index bed770b..74aa340 100644
--- a/cgit.h
+++ b/cgit.h
@@ -210,6 +210,7 @@ struct cgit_config {
210 int noheader; 210 int noheader;
211 int renamelimit; 211 int renamelimit;
212 int remove_suffix; 212 int remove_suffix;
213 int scan_hidden_path;
213 int section_from_path; 214 int section_from_path;
214 int snapshots; 215 int snapshots;
215 int summary_branches; 216 int summary_branches;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 3c20fe1..a832830 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -274,6 +274,14 @@ root-title::
274 Text printed as heading on the repository index page. Default value: 274 Text printed as heading on the repository index page. Default value:
275 "Git Repository Browser". 275 "Git Repository Browser".
276 276
277scan-hidden-path::
278 If set to "1" and scan-path is enabled, scan-path will recurse into
279 directories whose name starts with a period ('.'). Otherwise,
280 scan-path will stay away from such directories (considered as
281 "hidden"). Note that this does not apply to the ".git" directory in
282 non-bare repos. This must be defined prior to scan-path.
283 Default value: 0. See also: scan-path.
284
277scan-path:: 285scan-path::
278 A path which will be scanned for repositories. If caching is enabled, 286 A path which will be scanned for repositories. If caching is enabled,
279 the result will be cached as a cgitrc include-file in the cache 287 the result will be cached as a cgitrc include-file in the cache
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)
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] == '.') {
@@ -184,6 +183,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
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')
186 continue; 185 continue;
186 if (!ctx.cfg.scan_hidden_path)
187 continue;
187 } 188 }
188 buf = malloc(strlen(path) + strlen(ent->d_name) + 2); 189 buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
189 if (!buf) { 190 if (!buf) {
@@ -202,6 +203,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
202 scan_path(base, buf, fn); 203 scan_path(base, buf, fn);
203 free(buf); 204 free(buf);
204 } 205 }
206end:
205 closedir(dir); 207 closedir(dir);
206} 208}
207 209