|
diff --git a/cgit.c b/cgit.c index ec40e1f..bd37788 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -37,15 +37,64 @@ struct cgit_filter *new_filter(const char *cmd, int extra_args) |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
38 | f->argv[0] = f->cmd; |
38 | f->argv[0] = f->cmd; |
39 | f->argv[1] = NULL; |
39 | f->argv[1] = NULL; |
40 | return f; |
40 | return f; |
41 | } |
41 | } |
42 | |
42 | |
| |
43 | static void process_cached_repolist(const char *path); |
| |
44 | |
| |
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
| |
46 | { |
| |
47 | if (!strcmp(name, "name")) |
| |
48 | repo->name = xstrdup(value); |
| |
49 | else if (!strcmp(name, "clone-url")) |
| |
50 | repo->clone_url = xstrdup(value); |
| |
51 | else if (!strcmp(name, "desc")) |
| |
52 | repo->desc = xstrdup(value); |
| |
53 | else if (!strcmp(name, "owner")) |
| |
54 | repo->owner = xstrdup(value); |
| |
55 | else if (!strcmp(name, "defbranch")) |
| |
56 | repo->defbranch = xstrdup(value); |
| |
57 | else if (!strcmp(name, "snapshots")) |
| |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
| |
59 | else if (!strcmp(name, "enable-log-filecount")) |
| |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
| |
61 | else if (!strcmp(name, "enable-log-linecount")) |
| |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
63 | else if (!strcmp(name, "max-stats")) |
| |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); |
| |
65 | else if (!strcmp(name, "module-link")) |
| |
66 | repo->module_link= xstrdup(value); |
| |
67 | else if (!strcmp(name, "section")) |
| |
68 | repo->section = xstrdup(value); |
| |
69 | else if (!strcmp(name, "readme") && value != NULL) { |
| |
70 | if (*value == '/') |
| |
71 | ctx.repo->readme = xstrdup(value); |
| |
72 | else |
| |
73 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
| |
74 | } else if (ctx.cfg.enable_filter_overrides) { |
| |
75 | if (!strcmp(name, "about-filter")) |
| |
76 | repo->about_filter = new_filter(value, 0); |
| |
77 | else if (!strcmp(name, "commit-filter")) |
| |
78 | repo->commit_filter = new_filter(value, 0); |
| |
79 | else if (!strcmp(name, "source-filter")) |
| |
80 | repo->source_filter = new_filter(value, 1); |
| |
81 | } |
| |
82 | } |
| |
83 | |
43 | void config_cb(const char *name, const char *value) |
84 | void config_cb(const char *name, const char *value) |
44 | { |
85 | { |
45 | if (!strcmp(name, "root-title")) |
86 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
| |
87 | ctx.cfg.section = xstrdup(value); |
| |
88 | else if (!strcmp(name, "repo.url")) |
| |
89 | ctx.repo = cgit_add_repo(value); |
| |
90 | else if (ctx.repo && !strcmp(name, "repo.path")) |
| |
91 | ctx.repo->path = trim_end(value, '/'); |
| |
92 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
| |
93 | repo_config(ctx.repo, name + 5, value); |
| |
94 | else if (!strcmp(name, "root-title")) |
46 | ctx.cfg.root_title = xstrdup(value); |
95 | ctx.cfg.root_title = xstrdup(value); |
47 | else if (!strcmp(name, "root-desc")) |
96 | else if (!strcmp(name, "root-desc")) |
48 | ctx.cfg.root_desc = xstrdup(value); |
97 | ctx.cfg.root_desc = xstrdup(value); |
49 | else if (!strcmp(name, "root-readme")) |
98 | else if (!strcmp(name, "root-readme")) |
50 | ctx.cfg.root_readme = xstrdup(value); |
99 | ctx.cfg.root_readme = xstrdup(value); |
51 | else if (!strcmp(name, "css")) |
100 | else if (!strcmp(name, "css")) |
@@ -77,12 +126,14 @@ void config_cb(const char *name, const char *value) |
77 | else if (!strcmp(name, "noplainemail")) |
126 | else if (!strcmp(name, "noplainemail")) |
78 | ctx.cfg.noplainemail = atoi(value); |
127 | ctx.cfg.noplainemail = atoi(value); |
79 | else if (!strcmp(name, "noheader")) |
128 | else if (!strcmp(name, "noheader")) |
80 | ctx.cfg.noheader = atoi(value); |
129 | ctx.cfg.noheader = atoi(value); |
81 | else if (!strcmp(name, "snapshots")) |
130 | else if (!strcmp(name, "snapshots")) |
82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
131 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
| |
132 | else if (!strcmp(name, "enable-filter-overrides")) |
| |
133 | ctx.cfg.enable_filter_overrides = atoi(value); |
83 | else if (!strcmp(name, "enable-index-links")) |
134 | else if (!strcmp(name, "enable-index-links")) |
84 | ctx.cfg.enable_index_links = atoi(value); |
135 | ctx.cfg.enable_index_links = atoi(value); |
85 | else if (!strcmp(name, "enable-log-filecount")) |
136 | else if (!strcmp(name, "enable-log-filecount")) |
86 | ctx.cfg.enable_log_filecount = atoi(value); |
137 | ctx.cfg.enable_log_filecount = atoi(value); |
87 | else if (!strcmp(name, "enable-log-linecount")) |
138 | else if (!strcmp(name, "enable-log-linecount")) |
88 | ctx.cfg.enable_log_linecount = atoi(value); |
139 | ctx.cfg.enable_log_linecount = atoi(value); |
@@ -95,12 +146,14 @@ void config_cb(const char *name, const char *value) |
95 | else if (!strcmp(name, "cache-root")) |
146 | else if (!strcmp(name, "cache-root")) |
96 | ctx.cfg.cache_root = xstrdup(value); |
147 | ctx.cfg.cache_root = xstrdup(value); |
97 | else if (!strcmp(name, "cache-root-ttl")) |
148 | else if (!strcmp(name, "cache-root-ttl")) |
98 | ctx.cfg.cache_root_ttl = atoi(value); |
149 | ctx.cfg.cache_root_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-repo-ttl")) |
150 | else if (!strcmp(name, "cache-repo-ttl")) |
100 | ctx.cfg.cache_repo_ttl = atoi(value); |
151 | ctx.cfg.cache_repo_ttl = atoi(value); |
| |
152 | else if (!strcmp(name, "cache-scanrc-ttl")) |
| |
153 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-static-ttl")) |
154 | else if (!strcmp(name, "cache-static-ttl")) |
102 | ctx.cfg.cache_static_ttl = atoi(value); |
155 | ctx.cfg.cache_static_ttl = atoi(value); |
103 | else if (!strcmp(name, "cache-dynamic-ttl")) |
156 | else if (!strcmp(name, "cache-dynamic-ttl")) |
104 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
157 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
105 | else if (!strcmp(name, "about-filter")) |
158 | else if (!strcmp(name, "about-filter")) |
106 | ctx.cfg.about_filter = new_filter(value, 0); |
159 | ctx.cfg.about_filter = new_filter(value, 0); |
@@ -113,12 +166,17 @@ void config_cb(const char *name, const char *value) |
113 | else if (!strcmp(name, "max-repodesc-length")) |
166 | else if (!strcmp(name, "max-repodesc-length")) |
114 | ctx.cfg.max_repodesc_len = atoi(value); |
167 | ctx.cfg.max_repodesc_len = atoi(value); |
115 | else if (!strcmp(name, "max-repo-count")) |
168 | else if (!strcmp(name, "max-repo-count")) |
116 | ctx.cfg.max_repo_count = atoi(value); |
169 | ctx.cfg.max_repo_count = atoi(value); |
117 | else if (!strcmp(name, "max-commit-count")) |
170 | else if (!strcmp(name, "max-commit-count")) |
118 | ctx.cfg.max_commit_count = atoi(value); |
171 | ctx.cfg.max_commit_count = atoi(value); |
| |
172 | else if (!strcmp(name, "scan-path")) |
| |
173 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
| |
174 | process_cached_repolist(value); |
| |
175 | else |
| |
176 | scan_tree(value, repo_config); |
119 | else if (!strcmp(name, "source-filter")) |
177 | else if (!strcmp(name, "source-filter")) |
120 | ctx.cfg.source_filter = new_filter(value, 1); |
178 | ctx.cfg.source_filter = new_filter(value, 1); |
121 | else if (!strcmp(name, "summary-log")) |
179 | else if (!strcmp(name, "summary-log")) |
122 | ctx.cfg.summary_log = atoi(value); |
180 | ctx.cfg.summary_log = atoi(value); |
123 | else if (!strcmp(name, "summary-branches")) |
181 | else if (!strcmp(name, "summary-branches")) |
124 | ctx.cfg.summary_branches = atoi(value); |
182 | ctx.cfg.summary_branches = atoi(value); |
@@ -133,50 +191,13 @@ void config_cb(const char *name, const char *value) |
133 | else if (!strcmp(name, "clone-prefix")) |
191 | else if (!strcmp(name, "clone-prefix")) |
134 | ctx.cfg.clone_prefix = xstrdup(value); |
192 | ctx.cfg.clone_prefix = xstrdup(value); |
135 | else if (!strcmp(name, "local-time")) |
193 | else if (!strcmp(name, "local-time")) |
136 | ctx.cfg.local_time = atoi(value); |
194 | ctx.cfg.local_time = atoi(value); |
137 | else if (!prefixcmp(name, "mimetype.")) |
195 | else if (!prefixcmp(name, "mimetype.")) |
138 | add_mimetype(name + 9, value); |
196 | add_mimetype(name + 9, value); |
139 | else if (!strcmp(name, "repo.group")) |
197 | else if (!strcmp(name, "include")) |
140 | ctx.cfg.repo_group = xstrdup(value); |
| |
141 | else if (!strcmp(name, "repo.url")) |
| |
142 | ctx.repo = cgit_add_repo(value); |
| |
143 | else if (!strcmp(name, "repo.name")) |
| |
144 | ctx.repo->name = xstrdup(value); |
| |
145 | else if (ctx.repo && !strcmp(name, "repo.path")) |
| |
146 | ctx.repo->path = trim_end(value, '/'); |
| |
147 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
| |
148 | ctx.repo->clone_url = xstrdup(value); |
| |
149 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
| |
150 | ctx.repo->desc = xstrdup(value); |
| |
151 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
| |
152 | ctx.repo->owner = xstrdup(value); |
| |
153 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
| |
154 | ctx.repo->defbranch = xstrdup(value); |
| |
155 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
| |
156 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
| |
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
| |
158 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
| |
159 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
| |
160 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
161 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
| |
162 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
| |
163 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
| |
164 | ctx.repo->module_link= xstrdup(value); |
| |
165 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
| |
166 | ctx.repo->about_filter = new_filter(value, 0); |
| |
167 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
| |
168 | ctx.repo->commit_filter = new_filter(value, 0); |
| |
169 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
| |
170 | ctx.repo->source_filter = new_filter(value, 1); |
| |
171 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
| |
172 | if (*value == '/') |
| |
173 | ctx.repo->readme = xstrdup(value); |
| |
174 | else |
| |
175 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
| |
176 | } else if (!strcmp(name, "include")) |
| |
177 | parse_configfile(value, config_cb); |
198 | parse_configfile(value, config_cb); |
178 | } |
199 | } |
179 | |
200 | |
180 | static void querystring_cb(const char *name, const char *value) |
201 | static void querystring_cb(const char *name, const char *value) |
181 | { |
202 | { |
182 | if (!value) |
203 | if (!value) |
@@ -233,12 +254,13 @@ static void prepare_context(struct cgit_context *ctx) |
233 | ctx->cfg.cache_size = 0; |
254 | ctx->cfg.cache_size = 0; |
234 | ctx->cfg.cache_dynamic_ttl = 5; |
255 | ctx->cfg.cache_dynamic_ttl = 5; |
235 | ctx->cfg.cache_max_create_time = 5; |
256 | ctx->cfg.cache_max_create_time = 5; |
236 | ctx->cfg.cache_repo_ttl = 5; |
257 | ctx->cfg.cache_repo_ttl = 5; |
237 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
258 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
238 | ctx->cfg.cache_root_ttl = 5; |
259 | ctx->cfg.cache_root_ttl = 5; |
| |
260 | ctx->cfg.cache_scanrc_ttl = 15; |
239 | ctx->cfg.cache_static_ttl = -1; |
261 | ctx->cfg.cache_static_ttl = -1; |
240 | ctx->cfg.css = "/cgit.css"; |
262 | ctx->cfg.css = "/cgit.css"; |
241 | ctx->cfg.logo = "/cgit.png"; |
263 | ctx->cfg.logo = "/cgit.png"; |
242 | ctx->cfg.local_time = 0; |
264 | ctx->cfg.local_time = 0; |
243 | ctx->cfg.enable_tree_linenumbers = 1; |
265 | ctx->cfg.enable_tree_linenumbers = 1; |
244 | ctx->cfg.max_repo_count = 50; |
266 | ctx->cfg.max_repo_count = 50; |
@@ -250,12 +272,13 @@ static void prepare_context(struct cgit_context *ctx) |
250 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
251 | ctx->cfg.renamelimit = -1; |
273 | ctx->cfg.renamelimit = -1; |
252 | ctx->cfg.robots = "index, nofollow"; |
274 | ctx->cfg.robots = "index, nofollow"; |
253 | ctx->cfg.root_title = "Git repository browser"; |
275 | ctx->cfg.root_title = "Git repository browser"; |
254 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
276 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
255 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
277 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
| |
278 | ctx->cfg.section = ""; |
256 | ctx->cfg.summary_branches = 10; |
279 | ctx->cfg.summary_branches = 10; |
257 | ctx->cfg.summary_log = 10; |
280 | ctx->cfg.summary_log = 10; |
258 | ctx->cfg.summary_tags = 10; |
281 | ctx->cfg.summary_tags = 10; |
259 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
260 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
261 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
284 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
@@ -414,34 +437,157 @@ static void process_request(void *cbdata) |
414 | int cmp_repos(const void *a, const void *b) |
437 | int cmp_repos(const void *a, const void *b) |
415 | { |
438 | { |
416 | const struct cgit_repo *ra = a, *rb = b; |
439 | const struct cgit_repo *ra = a, *rb = b; |
417 | return strcmp(ra->url, rb->url); |
440 | return strcmp(ra->url, rb->url); |
418 | } |
441 | } |
419 | |
442 | |
420 | void print_repo(struct cgit_repo *repo) |
443 | char *build_snapshot_setting(int bitmap) |
| |
444 | { |
| |
445 | const struct cgit_snapshot_format *f; |
| |
446 | char *result = xstrdup(""); |
| |
447 | char *tmp; |
| |
448 | int len; |
| |
449 | |
| |
450 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
| |
451 | if (f->bit & bitmap) { |
| |
452 | tmp = result; |
| |
453 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
| |
454 | free(tmp); |
| |
455 | } |
| |
456 | } |
| |
457 | len = strlen(result); |
| |
458 | if (len) |
| |
459 | result[len - 1] = '\0'; |
| |
460 | return result; |
| |
461 | } |
| |
462 | |
| |
463 | char *get_first_line(char *txt) |
| |
464 | { |
| |
465 | char *t = xstrdup(txt); |
| |
466 | char *p = strchr(t, '\n'); |
| |
467 | if (p) |
| |
468 | *p = '\0'; |
| |
469 | return t; |
| |
470 | } |
| |
471 | |
| |
472 | void print_repo(FILE *f, struct cgit_repo *repo) |
421 | { |
473 | { |
422 | printf("repo.url=%s\n", repo->url); |
474 | fprintf(f, "repo.url=%s\n", repo->url); |
423 | printf("repo.name=%s\n", repo->name); |
475 | fprintf(f, "repo.name=%s\n", repo->name); |
424 | printf("repo.path=%s\n", repo->path); |
476 | fprintf(f, "repo.path=%s\n", repo->path); |
425 | if (repo->owner) |
477 | if (repo->owner) |
426 | printf("repo.owner=%s\n", repo->owner); |
478 | fprintf(f, "repo.owner=%s\n", repo->owner); |
427 | if (repo->desc) |
479 | if (repo->desc) { |
428 | printf("repo.desc=%s\n", repo->desc); |
480 | char *tmp = get_first_line(repo->desc); |
| |
481 | fprintf(f, "repo.desc=%s\n", tmp); |
| |
482 | free(tmp); |
| |
483 | } |
429 | if (repo->readme) |
484 | if (repo->readme) |
430 | printf("repo.readme=%s\n", repo->readme); |
485 | fprintf(f, "repo.readme=%s\n", repo->readme); |
431 | printf("\n"); |
486 | if (repo->defbranch) |
| |
487 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
| |
488 | if (repo->module_link) |
| |
489 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
| |
490 | if (repo->section) |
| |
491 | fprintf(f, "repo.section=%s\n", repo->section); |
| |
492 | if (repo->clone_url) |
| |
493 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
| |
494 | fprintf(f, "repo.enable-log-filecount=%d\n", |
| |
495 | repo->enable_log_filecount); |
| |
496 | fprintf(f, "repo.enable-log-linecount=%d\n", |
| |
497 | repo->enable_log_linecount); |
| |
498 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
| |
499 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
| |
500 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
| |
501 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
| |
502 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
| |
503 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
| |
504 | if (repo->snapshots != ctx.cfg.snapshots) { |
| |
505 | char *tmp = build_snapshot_setting(repo->snapshots); |
| |
506 | fprintf(f, "repo.snapshots=%s\n", tmp); |
| |
507 | free(tmp); |
| |
508 | } |
| |
509 | if (repo->max_stats != ctx.cfg.max_stats) |
| |
510 | fprintf(f, "repo.max-stats=%s\n", |
| |
511 | cgit_find_stats_periodname(repo->max_stats)); |
| |
512 | fprintf(f, "\n"); |
432 | } |
513 | } |
433 | |
514 | |
434 | void print_repolist(struct cgit_repolist *list) |
515 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
435 | { |
516 | { |
436 | int i; |
517 | int i; |
437 | |
518 | |
438 | for(i = 0; i < list->count; i++) |
519 | for(i = start; i < list->count; i++) |
439 | print_repo(&list->repos[i]); |
520 | print_repo(f, &list->repos[i]); |
| |
521 | } |
| |
522 | |
| |
523 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
| |
524 | * and return 0 on success. |
| |
525 | */ |
| |
526 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
| |
527 | { |
| |
528 | char *locked_rc; |
| |
529 | int idx; |
| |
530 | FILE *f; |
| |
531 | |
| |
532 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
| |
533 | f = fopen(locked_rc, "wx"); |
| |
534 | if (!f) { |
| |
535 | /* Inform about the error unless the lockfile already existed, |
| |
536 | * since that only means we've got concurrent requests. |
| |
537 | */ |
| |
538 | if (errno != EEXIST) |
| |
539 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
| |
540 | locked_rc, strerror(errno), errno); |
| |
541 | return errno; |
| |
542 | } |
| |
543 | idx = cgit_repolist.count; |
| |
544 | scan_tree(path, repo_config); |
| |
545 | print_repolist(f, &cgit_repolist, idx); |
| |
546 | if (rename(locked_rc, cached_rc)) |
| |
547 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
| |
548 | locked_rc, cached_rc, strerror(errno), errno); |
| |
549 | fclose(f); |
| |
550 | return 0; |
440 | } |
551 | } |
441 | |
552 | |
| |
553 | static void process_cached_repolist(const char *path) |
| |
554 | { |
| |
555 | struct stat st; |
| |
556 | char *cached_rc; |
| |
557 | time_t age; |
| |
558 | |
| |
559 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
| |
560 | hash_str(path))); |
| |
561 | |
| |
562 | if (stat(cached_rc, &st)) { |
| |
563 | /* Nothing is cached, we need to scan without forking. And |
| |
564 | * if we fail to generate a cached repolist, we need to |
| |
565 | * invoke scan_tree manually. |
| |
566 | */ |
| |
567 | if (generate_cached_repolist(path, cached_rc)) |
| |
568 | scan_tree(path, repo_config); |
| |
569 | return; |
| |
570 | } |
| |
571 | |
| |
572 | parse_configfile(cached_rc, config_cb); |
| |
573 | |
| |
574 | /* If the cached configfile hasn't expired, lets exit now */ |
| |
575 | age = time(NULL) - st.st_mtime; |
| |
576 | if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) |
| |
577 | return; |
| |
578 | |
| |
579 | /* The cached repolist has been parsed, but it was old. So lets |
| |
580 | * rescan the specified path and generate a new cached repolist |
| |
581 | * in a child-process to avoid latency for the current request. |
| |
582 | */ |
| |
583 | if (fork()) |
| |
584 | return; |
| |
585 | |
| |
586 | exit(generate_cached_repolist(path, cached_rc)); |
| |
587 | } |
442 | |
588 | |
443 | static void cgit_parse_args(int argc, const char **argv) |
589 | static void cgit_parse_args(int argc, const char **argv) |
444 | { |
590 | { |
445 | int i; |
591 | int i; |
446 | int scan = 0; |
592 | int scan = 0; |
447 | |
593 | |
@@ -472,21 +618,32 @@ static void cgit_parse_args(int argc, const char **argv) |
472 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
618 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
473 | ctx.qry.has_sha1 = 1; |
619 | ctx.qry.has_sha1 = 1; |
474 | } |
620 | } |
475 | if (!strncmp(argv[i], "--ofs=", 6)) { |
621 | if (!strncmp(argv[i], "--ofs=", 6)) { |
476 | ctx.qry.ofs = atoi(argv[i]+6); |
622 | ctx.qry.ofs = atoi(argv[i]+6); |
477 | } |
623 | } |
478 | if (!strncmp(argv[i], "--scan-tree=", 12)) { |
624 | if (!strncmp(argv[i], "--scan-tree=", 12) || |
| |
625 | !strncmp(argv[i], "--scan-path=", 12)) { |
| |
626 | /* HACK: the global snapshot bitmask defines the |
| |
627 | * set of allowed snapshot formats, but the config |
| |
628 | * file hasn't been parsed yet so the mask is |
| |
629 | * currently 0. By setting all bits high before |
| |
630 | * scanning we make sure that any in-repo cgitrc |
| |
631 | * snapshot setting is respected by scan_tree(). |
| |
632 | * BTW: we assume that there'll never be more than |
| |
633 | * 255 different snapshot formats supported by cgit... |
| |
634 | */ |
| |
635 | ctx.cfg.snapshots = 0xFF; |
479 | scan++; |
636 | scan++; |
480 | scan_tree(argv[i] + 12); |
637 | scan_tree(argv[i] + 12, repo_config); |
481 | } |
638 | } |
482 | } |
639 | } |
483 | if (scan) { |
640 | if (scan) { |
484 | qsort(cgit_repolist.repos, cgit_repolist.count, |
641 | qsort(cgit_repolist.repos, cgit_repolist.count, |
485 | sizeof(struct cgit_repo), cmp_repos); |
642 | sizeof(struct cgit_repo), cmp_repos); |
486 | print_repolist(&cgit_repolist); |
643 | print_repolist(stdout, &cgit_repolist, 0); |
487 | exit(0); |
644 | exit(0); |
488 | } |
645 | } |
489 | } |
646 | } |
490 | |
647 | |
491 | static int calc_ttl() |
648 | static int calc_ttl() |
492 | { |
649 | { |
|