-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 | 2 |
4 files changed, 14 insertions, 0 deletions
@@ -174,48 +174,50 @@ void config_cb(const char *name, const char *value) | |||
174 | else if (!strcmp(name, "embedded")) | 174 | else if (!strcmp(name, "embedded")) |
175 | ctx.cfg.embedded = atoi(value); | 175 | ctx.cfg.embedded = atoi(value); |
176 | else if (!strcmp(name, "max-atom-items")) | 176 | else if (!strcmp(name, "max-atom-items")) |
177 | ctx.cfg.max_atom_items = atoi(value); | 177 | ctx.cfg.max_atom_items = atoi(value); |
178 | else if (!strcmp(name, "max-message-length")) | 178 | else if (!strcmp(name, "max-message-length")) |
179 | ctx.cfg.max_msg_len = atoi(value); | 179 | ctx.cfg.max_msg_len = atoi(value); |
180 | else if (!strcmp(name, "max-repodesc-length")) | 180 | else if (!strcmp(name, "max-repodesc-length")) |
181 | ctx.cfg.max_repodesc_len = atoi(value); | 181 | ctx.cfg.max_repodesc_len = atoi(value); |
182 | else if (!strcmp(name, "max-blob-size")) | 182 | else if (!strcmp(name, "max-blob-size")) |
183 | ctx.cfg.max_blob_size = atoi(value); | 183 | ctx.cfg.max_blob_size = atoi(value); |
184 | else if (!strcmp(name, "max-repo-count")) | 184 | else if (!strcmp(name, "max-repo-count")) |
185 | ctx.cfg.max_repo_count = atoi(value); | 185 | ctx.cfg.max_repo_count = atoi(value); |
186 | else if (!strcmp(name, "max-commit-count")) | 186 | else if (!strcmp(name, "max-commit-count")) |
187 | ctx.cfg.max_commit_count = atoi(value); | 187 | ctx.cfg.max_commit_count = atoi(value); |
188 | else if (!strcmp(name, "project-list")) | 188 | else if (!strcmp(name, "project-list")) |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
190 | else if (!strcmp(name, "scan-path")) | 190 | else if (!strcmp(name, "scan-path")) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
192 | process_cached_repolist(expand_macros(value)); | 192 | process_cached_repolist(expand_macros(value)); |
193 | else if (ctx.cfg.project_list) | 193 | else if (ctx.cfg.project_list) |
194 | scan_projects(expand_macros(value), | 194 | scan_projects(expand_macros(value), |
195 | ctx.cfg.project_list, repo_config); | 195 | ctx.cfg.project_list, repo_config); |
196 | else | 196 | else |
197 | scan_tree(expand_macros(value), repo_config); | 197 | scan_tree(expand_macros(value), repo_config); |
198 | else if (!strcmp(name, "scan-hidden-path")) | ||
199 | ctx.cfg.scan_hidden_path = atoi(value); | ||
198 | else if (!strcmp(name, "section-from-path")) | 200 | else if (!strcmp(name, "section-from-path")) |
199 | ctx.cfg.section_from_path = atoi(value); | 201 | ctx.cfg.section_from_path = atoi(value); |
200 | else if (!strcmp(name, "source-filter")) | 202 | else if (!strcmp(name, "source-filter")) |
201 | ctx.cfg.source_filter = new_filter(value, 1); | 203 | ctx.cfg.source_filter = new_filter(value, 1); |
202 | else if (!strcmp(name, "summary-log")) | 204 | else if (!strcmp(name, "summary-log")) |
203 | ctx.cfg.summary_log = atoi(value); | 205 | ctx.cfg.summary_log = atoi(value); |
204 | else if (!strcmp(name, "summary-branches")) | 206 | else if (!strcmp(name, "summary-branches")) |
205 | ctx.cfg.summary_branches = atoi(value); | 207 | ctx.cfg.summary_branches = atoi(value); |
206 | else if (!strcmp(name, "summary-tags")) | 208 | else if (!strcmp(name, "summary-tags")) |
207 | ctx.cfg.summary_tags = atoi(value); | 209 | ctx.cfg.summary_tags = atoi(value); |
208 | else if (!strcmp(name, "side-by-side-diffs")) | 210 | else if (!strcmp(name, "side-by-side-diffs")) |
209 | ctx.cfg.ssdiff = atoi(value); | 211 | ctx.cfg.ssdiff = atoi(value); |
210 | else if (!strcmp(name, "agefile")) | 212 | else if (!strcmp(name, "agefile")) |
211 | ctx.cfg.agefile = xstrdup(value); | 213 | ctx.cfg.agefile = xstrdup(value); |
212 | else if (!strcmp(name, "renamelimit")) | 214 | else if (!strcmp(name, "renamelimit")) |
213 | ctx.cfg.renamelimit = atoi(value); | 215 | ctx.cfg.renamelimit = atoi(value); |
214 | else if (!strcmp(name, "remove-suffix")) | 216 | else if (!strcmp(name, "remove-suffix")) |
215 | ctx.cfg.remove_suffix = atoi(value); | 217 | ctx.cfg.remove_suffix = atoi(value); |
216 | else if (!strcmp(name, "robots")) | 218 | else if (!strcmp(name, "robots")) |
217 | ctx.cfg.robots = xstrdup(value); | 219 | ctx.cfg.robots = xstrdup(value); |
218 | else if (!strcmp(name, "clone-prefix")) | 220 | else if (!strcmp(name, "clone-prefix")) |
219 | ctx.cfg.clone_prefix = xstrdup(value); | 221 | ctx.cfg.clone_prefix = xstrdup(value); |
220 | else if (!strcmp(name, "local-time")) | 222 | else if (!strcmp(name, "local-time")) |
221 | ctx.cfg.local_time = atoi(value); | 223 | ctx.cfg.local_time = atoi(value); |
@@ -294,48 +296,49 @@ static void prepare_context(struct cgit_context *ctx) | |||
294 | ctx->cfg.cache_repo_ttl = 5; | 296 | ctx->cfg.cache_repo_ttl = 5; |
295 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 297 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
296 | ctx->cfg.cache_root_ttl = 5; | 298 | ctx->cfg.cache_root_ttl = 5; |
297 | ctx->cfg.cache_scanrc_ttl = 15; | 299 | ctx->cfg.cache_scanrc_ttl = 15; |
298 | ctx->cfg.cache_static_ttl = -1; | 300 | ctx->cfg.cache_static_ttl = -1; |
299 | ctx->cfg.css = "/cgit.css"; | 301 | ctx->cfg.css = "/cgit.css"; |
300 | ctx->cfg.logo = "/cgit.png"; | 302 | ctx->cfg.logo = "/cgit.png"; |
301 | ctx->cfg.local_time = 0; | 303 | ctx->cfg.local_time = 0; |
302 | ctx->cfg.enable_gitweb_owner = 1; | 304 | ctx->cfg.enable_gitweb_owner = 1; |
303 | ctx->cfg.enable_tree_linenumbers = 1; | 305 | ctx->cfg.enable_tree_linenumbers = 1; |
304 | ctx->cfg.max_repo_count = 50; | 306 | ctx->cfg.max_repo_count = 50; |
305 | ctx->cfg.max_commit_count = 50; | 307 | ctx->cfg.max_commit_count = 50; |
306 | ctx->cfg.max_lock_attempts = 5; | 308 | ctx->cfg.max_lock_attempts = 5; |
307 | ctx->cfg.max_msg_len = 80; | 309 | ctx->cfg.max_msg_len = 80; |
308 | ctx->cfg.max_repodesc_len = 80; | 310 | ctx->cfg.max_repodesc_len = 80; |
309 | ctx->cfg.max_blob_size = 0; | 311 | ctx->cfg.max_blob_size = 0; |
310 | ctx->cfg.max_stats = 0; | 312 | ctx->cfg.max_stats = 0; |
311 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 313 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
312 | ctx->cfg.project_list = NULL; | 314 | ctx->cfg.project_list = NULL; |
313 | ctx->cfg.renamelimit = -1; | 315 | ctx->cfg.renamelimit = -1; |
314 | ctx->cfg.remove_suffix = 0; | 316 | ctx->cfg.remove_suffix = 0; |
315 | ctx->cfg.robots = "index, nofollow"; | 317 | ctx->cfg.robots = "index, nofollow"; |
316 | ctx->cfg.root_title = "Git repository browser"; | 318 | ctx->cfg.root_title = "Git repository browser"; |
317 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 319 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
320 | ctx->cfg.scan_hidden_path = 0; | ||
318 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 321 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
319 | ctx->cfg.section = ""; | 322 | ctx->cfg.section = ""; |
320 | ctx->cfg.summary_branches = 10; | 323 | ctx->cfg.summary_branches = 10; |
321 | ctx->cfg.summary_log = 10; | 324 | ctx->cfg.summary_log = 10; |
322 | ctx->cfg.summary_tags = 10; | 325 | ctx->cfg.summary_tags = 10; |
323 | ctx->cfg.max_atom_items = 10; | 326 | ctx->cfg.max_atom_items = 10; |
324 | ctx->cfg.ssdiff = 0; | 327 | ctx->cfg.ssdiff = 0; |
325 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 328 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
326 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 329 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
327 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 330 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
328 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 331 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
329 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 332 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
330 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 333 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
331 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 334 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
332 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 335 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
333 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 336 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
334 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 337 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
335 | ctx->page.mimetype = "text/html"; | 338 | ctx->page.mimetype = "text/html"; |
336 | ctx->page.charset = PAGE_ENCODING; | 339 | ctx->page.charset = PAGE_ENCODING; |
337 | ctx->page.filename = NULL; | 340 | ctx->page.filename = NULL; |
338 | ctx->page.size = 0; | 341 | ctx->page.size = 0; |
339 | ctx->page.modified = time(NULL); | 342 | ctx->page.modified = time(NULL); |
340 | ctx->page.expires = ctx->page.modified; | 343 | ctx->page.expires = ctx->page.modified; |
341 | ctx->page.etag = NULL; | 344 | ctx->page.etag = NULL; |
@@ -186,48 +186,49 @@ struct cgit_config { | |||
186 | int cache_static_ttl; | 186 | int cache_static_ttl; |
187 | int embedded; | 187 | int embedded; |
188 | int enable_filter_overrides; | 188 | int enable_filter_overrides; |
189 | int enable_gitweb_owner; | 189 | int enable_gitweb_owner; |
190 | int enable_index_links; | 190 | int enable_index_links; |
191 | int enable_log_filecount; | 191 | int enable_log_filecount; |
192 | int enable_log_linecount; | 192 | int enable_log_linecount; |
193 | int enable_remote_branches; | 193 | int enable_remote_branches; |
194 | int enable_subject_links; | 194 | int enable_subject_links; |
195 | int enable_tree_linenumbers; | 195 | int enable_tree_linenumbers; |
196 | int local_time; | 196 | int local_time; |
197 | int max_atom_items; | 197 | int max_atom_items; |
198 | int max_repo_count; | 198 | int max_repo_count; |
199 | int max_commit_count; | 199 | int max_commit_count; |
200 | int max_lock_attempts; | 200 | int max_lock_attempts; |
201 | int max_msg_len; | 201 | int max_msg_len; |
202 | int max_repodesc_len; | 202 | int max_repodesc_len; |
203 | int max_blob_size; | 203 | int max_blob_size; |
204 | int max_stats; | 204 | int max_stats; |
205 | int nocache; | 205 | int nocache; |
206 | int noplainemail; | 206 | int noplainemail; |
207 | int noheader; | 207 | int noheader; |
208 | int renamelimit; | 208 | int renamelimit; |
209 | int remove_suffix; | 209 | int remove_suffix; |
210 | int scan_hidden_path; | ||
210 | int section_from_path; | 211 | int section_from_path; |
211 | int snapshots; | 212 | int snapshots; |
212 | int summary_branches; | 213 | int summary_branches; |
213 | int summary_log; | 214 | int summary_log; |
214 | int summary_tags; | 215 | int summary_tags; |
215 | int ssdiff; | 216 | int ssdiff; |
216 | struct string_list mimetypes; | 217 | struct string_list mimetypes; |
217 | struct cgit_filter *about_filter; | 218 | struct cgit_filter *about_filter; |
218 | struct cgit_filter *commit_filter; | 219 | struct cgit_filter *commit_filter; |
219 | struct cgit_filter *source_filter; | 220 | struct cgit_filter *source_filter; |
220 | }; | 221 | }; |
221 | 222 | ||
222 | struct cgit_page { | 223 | struct cgit_page { |
223 | time_t modified; | 224 | time_t modified; |
224 | time_t expires; | 225 | time_t expires; |
225 | size_t size; | 226 | size_t size; |
226 | char *mimetype; | 227 | char *mimetype; |
227 | char *charset; | 228 | char *charset; |
228 | char *filename; | 229 | char *filename; |
229 | char *etag; | 230 | char *etag; |
230 | char *title; | 231 | char *title; |
231 | int status; | 232 | int status; |
232 | char *statusmsg; | 233 | char *statusmsg; |
233 | }; | 234 | }; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 8e51ca5..1dc3cce 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -248,48 +248,56 @@ renamelimit:: | |||
248 | "-1" uses the compiletime value in git (for further info, look at | 248 | "-1" uses the compiletime value in git (for further info, look at |
249 | `man git-diff`). Default value: "-1". | 249 | `man git-diff`). Default value: "-1". |
250 | 250 | ||
251 | repo.group:: | 251 | repo.group:: |
252 | Legacy alias for "section". This option is deprecated and will not be | 252 | Legacy alias for "section". This option is deprecated and will not be |
253 | supported in cgit-1.0. | 253 | supported in cgit-1.0. |
254 | 254 | ||
255 | robots:: | 255 | robots:: |
256 | Text used as content for the "robots" meta-tag. Default value: | 256 | Text used as content for the "robots" meta-tag. Default value: |
257 | "index, nofollow". | 257 | "index, nofollow". |
258 | 258 | ||
259 | root-desc:: | 259 | root-desc:: |
260 | Text printed below the heading on the repository index page. Default | 260 | Text printed below the heading on the repository index page. Default |
261 | value: "a fast webinterface for the git dscm". | 261 | value: "a fast webinterface for the git dscm". |
262 | 262 | ||
263 | root-readme:: | 263 | root-readme:: |
264 | The content of the file specified with this option will be included | 264 | The content of the file specified with this option will be included |
265 | verbatim below the "about" link on the repository index page. Default | 265 | verbatim below the "about" link on the repository index page. Default |
266 | value: none. | 266 | value: none. |
267 | 267 | ||
268 | root-title:: | 268 | root-title:: |
269 | Text printed as heading on the repository index page. Default value: | 269 | Text printed as heading on the repository index page. Default value: |
270 | "Git Repository Browser". | 270 | "Git Repository Browser". |
271 | 271 | ||
272 | scan-hidden-path:: | ||
273 | If set to "1" and scan-path is enabled, scan-path will recurse into | ||
274 | directories whose name starts with a period ('.'). Otherwise, | ||
275 | scan-path will stay away from such directories (considered as | ||
276 | "hidden"). Note that this does not apply to the ".git" directory in | ||
277 | non-bare repos. This must be defined prior to scan-path. | ||
278 | Default value: 0. See also: scan-path. | ||
279 | |||
272 | scan-path:: | 280 | scan-path:: |
273 | A path which will be scanned for repositories. If caching is enabled, | 281 | A path which will be scanned for repositories. If caching is enabled, |
274 | the result will be cached as a cgitrc include-file in the cache | 282 | the result will be cached as a cgitrc include-file in the cache |
275 | directory. If project-list has been defined prior to scan-path, | 283 | directory. If project-list has been defined prior to scan-path, |
276 | scan-path loads only the directories listed in the file pointed to by | 284 | scan-path loads only the directories listed in the file pointed to by |
277 | project-list. Default value: none. See also: cache-scanrc-ttl, | 285 | project-list. Default value: none. See also: cache-scanrc-ttl, |
278 | project-list. | 286 | project-list. |
279 | 287 | ||
280 | section:: | 288 | section:: |
281 | The name of the current repository section - all repositories defined | 289 | The name of the current repository section - all repositories defined |
282 | after this option will inherit the current section name. Default value: | 290 | after this option will inherit the current section name. Default value: |
283 | none. | 291 | none. |
284 | 292 | ||
285 | section-from-path:: | 293 | section-from-path:: |
286 | A number which, if specified before scan-path, specifies how many | 294 | A number which, if specified before scan-path, specifies how many |
287 | path elements from each repo path to use as a default section name. | 295 | path elements from each repo path to use as a default section name. |
288 | If negative, cgit will discard the specified number of path elements | 296 | If negative, cgit will discard the specified number of path elements |
289 | above the repo directory. Default value: 0. | 297 | above the repo directory. Default value: 0. |
290 | 298 | ||
291 | side-by-side-diffs:: | 299 | side-by-side-diffs:: |
292 | If set to "1" shows side-by-side diffs instead of unidiffs per | 300 | If set to "1" shows side-by-side diffs instead of unidiffs per |
293 | default. Default value: "0". | 301 | default. Default value: "0". |
294 | 302 | ||
295 | snapshots:: | 303 | snapshots:: |
diff --git a/scan-tree.c b/scan-tree.c index eda8c67..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -162,48 +162,50 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
162 | DIR *dir = opendir(path); | 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) { | 167 | if (!dir) { |
168 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | 168 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", |
169 | path, strerror(errno), errno); | 169 | path, strerror(errno), errno); |
170 | return; | 170 | return; |
171 | } | 171 | } |
172 | if (is_git_dir(path)) { | 172 | if (is_git_dir(path)) { |
173 | add_repo(base, path, fn); | 173 | add_repo(base, path, fn); |
174 | goto end; | 174 | goto end; |
175 | } | 175 | } |
176 | if (is_git_dir(fmt("%s/.git", path))) { | 176 | if (is_git_dir(fmt("%s/.git", path))) { |
177 | add_repo(base, fmt("%s/.git", path), fn); | 177 | add_repo(base, fmt("%s/.git", path), fn); |
178 | goto end; | 178 | goto end; |
179 | } | 179 | } |
180 | while((ent = readdir(dir)) != NULL) { | 180 | while((ent = readdir(dir)) != NULL) { |
181 | if (ent->d_name[0] == '.') { | 181 | if (ent->d_name[0] == '.') { |
182 | if (ent->d_name[1] == '\0') | 182 | if (ent->d_name[1] == '\0') |
183 | continue; | 183 | continue; |
184 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | 184 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') |
185 | continue; | 185 | continue; |
186 | if (!ctx.cfg.scan_hidden_path) | ||
187 | continue; | ||
186 | } | 188 | } |
187 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | 189 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); |
188 | if (!buf) { | 190 | if (!buf) { |
189 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 191 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |
190 | path, strerror(errno), errno); | 192 | path, strerror(errno), errno); |
191 | exit(1); | 193 | exit(1); |
192 | } | 194 | } |
193 | sprintf(buf, "%s/%s", path, ent->d_name); | 195 | sprintf(buf, "%s/%s", path, ent->d_name); |
194 | if (stat(buf, &st)) { | 196 | if (stat(buf, &st)) { |
195 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 197 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
196 | buf, strerror(errno), errno); | 198 | buf, strerror(errno), errno); |
197 | free(buf); | 199 | free(buf); |
198 | continue; | 200 | continue; |
199 | } | 201 | } |
200 | if (S_ISDIR(st.st_mode)) | 202 | if (S_ISDIR(st.st_mode)) |
201 | scan_path(base, buf, fn); | 203 | scan_path(base, buf, fn); |
202 | free(buf); | 204 | free(buf); |
203 | } | 205 | } |
204 | end: | 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 | ||