-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc.5.txt | 8 | ||||
-rw-r--r-- | scan-tree.c | 20 |
4 files changed, 23 insertions, 9 deletions
@@ -201,2 +201,4 @@ void config_cb(const char *name, const char *value) | |||
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")) |
@@ -321,2 +323,3 @@ static void prepare_context(struct cgit_context *ctx) | |||
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; |
@@ -212,2 +212,3 @@ struct cgit_config { | |||
212 | int remove_suffix; | 212 | int remove_suffix; |
213 | int scan_hidden_path; | ||
213 | int section_from_path; | 214 | int section_from_path; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 3c20fe1..a832830 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -276,2 +276,10 @@ root-title:: | |||
276 | 276 | ||
277 | scan-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 | |||
277 | scan-path:: | 285 | scan-path:: |
diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -161,3 +161,3 @@ static 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; |
@@ -166,5 +166,10 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
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 | } |
@@ -172,9 +177,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
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 | } |
@@ -186,2 +185,4 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
186 | continue; | 185 | continue; |
186 | if (!ctx.cfg.scan_hidden_path) | ||
187 | continue; | ||
187 | } | 188 | } |
@@ -204,2 +205,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
204 | } | 205 | } |
206 | end: | ||
205 | closedir(dir); | 207 | closedir(dir); |