-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
@@ -194,16 +194,18 @@ void config_cb(const char *name, const char *value) | |||
194 | else if (!strcmp(name, "scan-path")) | 194 | else if (!strcmp(name, "scan-path")) |
195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
196 | process_cached_repolist(expand_macros(value)); | 196 | process_cached_repolist(expand_macros(value)); |
197 | else if (ctx.cfg.project_list) | 197 | else if (ctx.cfg.project_list) |
198 | scan_projects(expand_macros(value), | 198 | scan_projects(expand_macros(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")) |
205 | ctx.cfg.source_filter = new_filter(value, 1); | 207 | ctx.cfg.source_filter = new_filter(value, 1); |
206 | else if (!strcmp(name, "summary-log")) | 208 | else if (!strcmp(name, "summary-log")) |
207 | ctx.cfg.summary_log = atoi(value); | 209 | ctx.cfg.summary_log = atoi(value); |
208 | else if (!strcmp(name, "summary-branches")) | 210 | else if (!strcmp(name, "summary-branches")) |
209 | ctx.cfg.summary_branches = atoi(value); | 211 | ctx.cfg.summary_branches = atoi(value); |
@@ -314,16 +316,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
314 | ctx->cfg.max_stats = 0; | 316 | ctx->cfg.max_stats = 0; |
315 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 317 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
316 | ctx->cfg.project_list = NULL; | 318 | ctx->cfg.project_list = NULL; |
317 | ctx->cfg.renamelimit = -1; | 319 | ctx->cfg.renamelimit = -1; |
318 | ctx->cfg.remove_suffix = 0; | 320 | ctx->cfg.remove_suffix = 0; |
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; |
325 | ctx->cfg.summary_log = 10; | 328 | ctx->cfg.summary_log = 10; |
326 | ctx->cfg.summary_tags = 10; | 329 | ctx->cfg.summary_tags = 10; |
327 | ctx->cfg.max_atom_items = 10; | 330 | ctx->cfg.max_atom_items = 10; |
328 | ctx->cfg.ssdiff = 0; | 331 | ctx->cfg.ssdiff = 0; |
329 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 332 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
@@ -205,16 +205,17 @@ struct cgit_config { | |||
205 | int max_repodesc_len; | 205 | int max_repodesc_len; |
206 | int max_blob_size; | 206 | int max_blob_size; |
207 | int max_stats; | 207 | int max_stats; |
208 | int nocache; | 208 | int nocache; |
209 | int noplainemail; | 209 | int noplainemail; |
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; |
216 | int summary_log; | 217 | int summary_log; |
217 | int summary_tags; | 218 | int summary_tags; |
218 | int ssdiff; | 219 | int ssdiff; |
219 | struct string_list mimetypes; | 220 | struct string_list mimetypes; |
220 | struct cgit_filter *about_filter; | 221 | struct cgit_filter *about_filter; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 3c20fe1..a832830 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -269,16 +269,24 @@ root-readme:: | |||
269 | The content of the file specified with this option will be included | 269 | The content of the file specified with this option will be included |
270 | verbatim below the "about" link on the repository index page. Default | 270 | verbatim below the "about" link on the repository index page. Default |
271 | value: none. | 271 | value: none. |
272 | 272 | ||
273 | root-title:: | 273 | 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 | ||
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:: |
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 |
280 | directory. If project-list has been defined prior to scan-path, | 288 | directory. If project-list has been defined prior to scan-path, |
281 | scan-path loads only the directories listed in the file pointed to by | 289 | scan-path loads only the directories listed in the file pointed to by |
282 | project-list. Default value: none. See also: cache-scanrc-ttl, | 290 | project-list. Default value: none. See also: cache-scanrc-ttl, |
283 | project-list. | 291 | project-list. |
284 | 292 | ||
diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -154,41 +154,42 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
154 | if (!stat(p, &st)) { | 154 | if (!stat(p, &st)) { |
155 | config_fn = fn; | 155 | config_fn = fn; |
156 | parse_configfile(xstrdup(p), &repo_config); | 156 | parse_configfile(xstrdup(p), &repo_config); |
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | static void scan_path(const char *base, const char *path, repo_config_fn fn) | 160 | 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; |
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') |
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) { |
190 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 191 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |
191 | path, strerror(errno), errno); | 192 | path, strerror(errno), errno); |
192 | exit(1); | 193 | exit(1); |
193 | } | 194 | } |
194 | sprintf(buf, "%s/%s", path, ent->d_name); | 195 | sprintf(buf, "%s/%s", path, ent->d_name); |
@@ -197,16 +198,17 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
197 | buf, strerror(errno), errno); | 198 | buf, strerror(errno), errno); |
198 | free(buf); | 199 | free(buf); |
199 | continue; | 200 | continue; |
200 | } | 201 | } |
201 | if (S_ISDIR(st.st_mode)) | 202 | if (S_ISDIR(st.st_mode)) |
202 | scan_path(base, buf, fn); | 203 | scan_path(base, buf, fn); |
203 | free(buf); | 204 | free(buf); |
204 | } | 205 | } |
206 | end: | ||
205 | closedir(dir); | 207 | closedir(dir); |
206 | } | 208 | } |
207 | 209 | ||
208 | #define lastc(s) s[strlen(s) - 1] | 210 | #define lastc(s) s[strlen(s) - 1] |
209 | 211 | ||
210 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) | 212 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) |
211 | { | 213 | { |
212 | char line[MAX_PATH * 2], *z; | 214 | char line[MAX_PATH * 2], *z; |