|
diff --git a/cgit.c b/cgit.c index db96905..594b950 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -27,32 +27,34 @@ void add_mimetype(const char *name, const char *value) |
27 | |
27 | |
28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
29 | { |
29 | { |
30 | struct cgit_filter *f; |
30 | struct cgit_filter *f; |
31 | |
31 | |
32 | if (!cmd || !cmd[0]) |
32 | if (!cmd || !cmd[0]) |
33 | return NULL; |
33 | return NULL; |
34 | |
34 | |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
36 | f->cmd = xstrdup(cmd); |
36 | f->cmd = xstrdup(cmd); |
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 | |
43 | void config_cb(const char *name, const char *value) |
45 | void config_cb(const char *name, const char *value) |
44 | { |
46 | { |
45 | if (!strcmp(name, "root-title")) |
47 | if (!strcmp(name, "root-title")) |
46 | ctx.cfg.root_title = xstrdup(value); |
48 | ctx.cfg.root_title = xstrdup(value); |
47 | else if (!strcmp(name, "root-desc")) |
49 | else if (!strcmp(name, "root-desc")) |
48 | ctx.cfg.root_desc = xstrdup(value); |
50 | ctx.cfg.root_desc = xstrdup(value); |
49 | else if (!strcmp(name, "root-readme")) |
51 | else if (!strcmp(name, "root-readme")) |
50 | ctx.cfg.root_readme = xstrdup(value); |
52 | ctx.cfg.root_readme = xstrdup(value); |
51 | else if (!strcmp(name, "css")) |
53 | else if (!strcmp(name, "css")) |
52 | ctx.cfg.css = xstrdup(value); |
54 | ctx.cfg.css = xstrdup(value); |
53 | else if (!strcmp(name, "favicon")) |
55 | else if (!strcmp(name, "favicon")) |
54 | ctx.cfg.favicon = xstrdup(value); |
56 | ctx.cfg.favicon = xstrdup(value); |
55 | else if (!strcmp(name, "footer")) |
57 | else if (!strcmp(name, "footer")) |
56 | ctx.cfg.footer = xstrdup(value); |
58 | ctx.cfg.footer = xstrdup(value); |
57 | else if (!strcmp(name, "head-include")) |
59 | else if (!strcmp(name, "head-include")) |
58 | ctx.cfg.head_include = xstrdup(value); |
60 | ctx.cfg.head_include = xstrdup(value); |
@@ -83,32 +85,34 @@ void config_cb(const char *name, const char *value) |
83 | else if (!strcmp(name, "enable-index-links")) |
85 | else if (!strcmp(name, "enable-index-links")) |
84 | ctx.cfg.enable_index_links = atoi(value); |
86 | ctx.cfg.enable_index_links = atoi(value); |
85 | else if (!strcmp(name, "enable-log-filecount")) |
87 | else if (!strcmp(name, "enable-log-filecount")) |
86 | ctx.cfg.enable_log_filecount = atoi(value); |
88 | ctx.cfg.enable_log_filecount = atoi(value); |
87 | else if (!strcmp(name, "enable-log-linecount")) |
89 | else if (!strcmp(name, "enable-log-linecount")) |
88 | ctx.cfg.enable_log_linecount = atoi(value); |
90 | ctx.cfg.enable_log_linecount = atoi(value); |
89 | else if (!strcmp(name, "max-stats")) |
91 | else if (!strcmp(name, "max-stats")) |
90 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
92 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
91 | else if (!strcmp(name, "cache-size")) |
93 | else if (!strcmp(name, "cache-size")) |
92 | ctx.cfg.cache_size = atoi(value); |
94 | ctx.cfg.cache_size = atoi(value); |
93 | else if (!strcmp(name, "cache-root")) |
95 | else if (!strcmp(name, "cache-root")) |
94 | ctx.cfg.cache_root = xstrdup(value); |
96 | ctx.cfg.cache_root = xstrdup(value); |
95 | else if (!strcmp(name, "cache-root-ttl")) |
97 | else if (!strcmp(name, "cache-root-ttl")) |
96 | ctx.cfg.cache_root_ttl = atoi(value); |
98 | ctx.cfg.cache_root_ttl = atoi(value); |
97 | else if (!strcmp(name, "cache-repo-ttl")) |
99 | else if (!strcmp(name, "cache-repo-ttl")) |
98 | ctx.cfg.cache_repo_ttl = atoi(value); |
100 | ctx.cfg.cache_repo_ttl = atoi(value); |
| |
101 | else if (!strcmp(name, "cache-scanrc-ttl")) |
| |
102 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-static-ttl")) |
103 | else if (!strcmp(name, "cache-static-ttl")) |
100 | ctx.cfg.cache_static_ttl = atoi(value); |
104 | ctx.cfg.cache_static_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-dynamic-ttl")) |
105 | else if (!strcmp(name, "cache-dynamic-ttl")) |
102 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
106 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
103 | else if (!strcmp(name, "about-filter")) |
107 | else if (!strcmp(name, "about-filter")) |
104 | ctx.cfg.about_filter = new_filter(value, 0); |
108 | ctx.cfg.about_filter = new_filter(value, 0); |
105 | else if (!strcmp(name, "commit-filter")) |
109 | else if (!strcmp(name, "commit-filter")) |
106 | ctx.cfg.commit_filter = new_filter(value, 0); |
110 | ctx.cfg.commit_filter = new_filter(value, 0); |
107 | else if (!strcmp(name, "embedded")) |
111 | else if (!strcmp(name, "embedded")) |
108 | ctx.cfg.embedded = atoi(value); |
112 | ctx.cfg.embedded = atoi(value); |
109 | else if (!strcmp(name, "max-message-length")) |
113 | else if (!strcmp(name, "max-message-length")) |
110 | ctx.cfg.max_msg_len = atoi(value); |
114 | ctx.cfg.max_msg_len = atoi(value); |
111 | else if (!strcmp(name, "max-repodesc-length")) |
115 | else if (!strcmp(name, "max-repodesc-length")) |
112 | ctx.cfg.max_repodesc_len = atoi(value); |
116 | ctx.cfg.max_repodesc_len = atoi(value); |
113 | else if (!strcmp(name, "max-repo-count")) |
117 | else if (!strcmp(name, "max-repo-count")) |
114 | ctx.cfg.max_repo_count = atoi(value); |
118 | ctx.cfg.max_repo_count = atoi(value); |
@@ -124,33 +128,36 @@ void config_cb(const char *name, const char *value) |
124 | ctx.cfg.summary_tags = atoi(value); |
128 | ctx.cfg.summary_tags = atoi(value); |
125 | else if (!strcmp(name, "agefile")) |
129 | else if (!strcmp(name, "agefile")) |
126 | ctx.cfg.agefile = xstrdup(value); |
130 | ctx.cfg.agefile = xstrdup(value); |
127 | else if (!strcmp(name, "renamelimit")) |
131 | else if (!strcmp(name, "renamelimit")) |
128 | ctx.cfg.renamelimit = atoi(value); |
132 | ctx.cfg.renamelimit = atoi(value); |
129 | else if (!strcmp(name, "robots")) |
133 | else if (!strcmp(name, "robots")) |
130 | ctx.cfg.robots = xstrdup(value); |
134 | ctx.cfg.robots = xstrdup(value); |
131 | else if (!strcmp(name, "clone-prefix")) |
135 | else if (!strcmp(name, "clone-prefix")) |
132 | ctx.cfg.clone_prefix = xstrdup(value); |
136 | ctx.cfg.clone_prefix = xstrdup(value); |
133 | else if (!strcmp(name, "local-time")) |
137 | else if (!strcmp(name, "local-time")) |
134 | ctx.cfg.local_time = atoi(value); |
138 | ctx.cfg.local_time = atoi(value); |
135 | else if (!prefixcmp(name, "mimetype.")) |
139 | else if (!prefixcmp(name, "mimetype.")) |
136 | add_mimetype(name + 9, value); |
140 | add_mimetype(name + 9, value); |
137 | else if (!strcmp(name, "repo.group")) |
141 | else if (!strcmp(name, "repo.group")) |
138 | ctx.cfg.repo_group = xstrdup(value); |
142 | ctx.cfg.repo_group = xstrdup(value); |
139 | else if (!strcmp(name, "repo.scan")) |
143 | else if (!strcmp(name, "repo.scan")) |
140 | scan_tree(value); |
144 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
| |
145 | process_cached_repolist(value); |
| |
146 | else |
| |
147 | scan_tree(value); |
141 | else if (!strcmp(name, "repo.url")) |
148 | else if (!strcmp(name, "repo.url")) |
142 | ctx.repo = cgit_add_repo(value); |
149 | ctx.repo = cgit_add_repo(value); |
143 | else if (!strcmp(name, "repo.name")) |
150 | else if (!strcmp(name, "repo.name")) |
144 | ctx.repo->name = xstrdup(value); |
151 | ctx.repo->name = xstrdup(value); |
145 | else if (ctx.repo && !strcmp(name, "repo.path")) |
152 | else if (ctx.repo && !strcmp(name, "repo.path")) |
146 | ctx.repo->path = trim_end(value, '/'); |
153 | ctx.repo->path = trim_end(value, '/'); |
147 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
154 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
148 | ctx.repo->clone_url = xstrdup(value); |
155 | ctx.repo->clone_url = xstrdup(value); |
149 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
156 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
150 | ctx.repo->desc = xstrdup(value); |
157 | ctx.repo->desc = xstrdup(value); |
151 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
158 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
152 | ctx.repo->owner = xstrdup(value); |
159 | ctx.repo->owner = xstrdup(value); |
153 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
160 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
154 | ctx.repo->defbranch = xstrdup(value); |
161 | ctx.repo->defbranch = xstrdup(value); |
155 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
162 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
156 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
163 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
@@ -223,32 +230,33 @@ static void querystring_cb(const char *name, const char *value) |
223 | char *xstrdupn(const char *str) |
230 | char *xstrdupn(const char *str) |
224 | { |
231 | { |
225 | return (str ? xstrdup(str) : NULL); |
232 | return (str ? xstrdup(str) : NULL); |
226 | } |
233 | } |
227 | |
234 | |
228 | static void prepare_context(struct cgit_context *ctx) |
235 | static void prepare_context(struct cgit_context *ctx) |
229 | { |
236 | { |
230 | memset(ctx, 0, sizeof(ctx)); |
237 | memset(ctx, 0, sizeof(ctx)); |
231 | ctx->cfg.agefile = "info/web/last-modified"; |
238 | ctx->cfg.agefile = "info/web/last-modified"; |
232 | ctx->cfg.nocache = 0; |
239 | ctx->cfg.nocache = 0; |
233 | ctx->cfg.cache_size = 0; |
240 | ctx->cfg.cache_size = 0; |
234 | ctx->cfg.cache_dynamic_ttl = 5; |
241 | ctx->cfg.cache_dynamic_ttl = 5; |
235 | ctx->cfg.cache_max_create_time = 5; |
242 | ctx->cfg.cache_max_create_time = 5; |
236 | ctx->cfg.cache_repo_ttl = 5; |
243 | ctx->cfg.cache_repo_ttl = 5; |
237 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
244 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
238 | ctx->cfg.cache_root_ttl = 5; |
245 | ctx->cfg.cache_root_ttl = 5; |
| |
246 | ctx->cfg.cache_scanrc_ttl = 15; |
239 | ctx->cfg.cache_static_ttl = -1; |
247 | ctx->cfg.cache_static_ttl = -1; |
240 | ctx->cfg.css = "/cgit.css"; |
248 | ctx->cfg.css = "/cgit.css"; |
241 | ctx->cfg.logo = "/cgit.png"; |
249 | ctx->cfg.logo = "/cgit.png"; |
242 | ctx->cfg.local_time = 0; |
250 | ctx->cfg.local_time = 0; |
243 | ctx->cfg.max_repo_count = 50; |
251 | ctx->cfg.max_repo_count = 50; |
244 | ctx->cfg.max_commit_count = 50; |
252 | ctx->cfg.max_commit_count = 50; |
245 | ctx->cfg.max_lock_attempts = 5; |
253 | ctx->cfg.max_lock_attempts = 5; |
246 | ctx->cfg.max_msg_len = 80; |
254 | ctx->cfg.max_msg_len = 80; |
247 | ctx->cfg.max_repodesc_len = 80; |
255 | ctx->cfg.max_repodesc_len = 80; |
248 | ctx->cfg.max_stats = 0; |
256 | ctx->cfg.max_stats = 0; |
249 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
257 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
250 | ctx->cfg.renamelimit = -1; |
258 | ctx->cfg.renamelimit = -1; |
251 | ctx->cfg.robots = "index, nofollow"; |
259 | ctx->cfg.robots = "index, nofollow"; |
252 | ctx->cfg.root_title = "Git repository browser"; |
260 | ctx->cfg.root_title = "Git repository browser"; |
253 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
261 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
254 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
262 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
@@ -425,32 +433,97 @@ void print_repo(FILE *f, struct cgit_repo *repo) |
425 | fprintf(f, "repo.owner=%s\n", repo->owner); |
433 | fprintf(f, "repo.owner=%s\n", repo->owner); |
426 | if (repo->desc) |
434 | if (repo->desc) |
427 | fprintf(f, "repo.desc=%s\n", repo->desc); |
435 | fprintf(f, "repo.desc=%s\n", repo->desc); |
428 | if (repo->readme) |
436 | if (repo->readme) |
429 | fprintf(f, "repo.readme=%s\n", repo->readme); |
437 | fprintf(f, "repo.readme=%s\n", repo->readme); |
430 | fprintf(f, "\n"); |
438 | fprintf(f, "\n"); |
431 | } |
439 | } |
432 | |
440 | |
433 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
441 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
434 | { |
442 | { |
435 | int i; |
443 | int i; |
436 | |
444 | |
437 | for(i = start; i < list->count; i++) |
445 | for(i = start; i < list->count; i++) |
438 | print_repo(f, &list->repos[i]); |
446 | print_repo(f, &list->repos[i]); |
439 | } |
447 | } |
440 | |
448 | |
| |
449 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
| |
450 | * and return 0 on success. |
| |
451 | */ |
| |
452 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
| |
453 | { |
| |
454 | char *locked_rc; |
| |
455 | int idx; |
| |
456 | FILE *f; |
| |
457 | |
| |
458 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
| |
459 | f = fopen(locked_rc, "wx"); |
| |
460 | if (!f) { |
| |
461 | /* Inform about the error unless the lockfile already existed, |
| |
462 | * since that only means we've got concurrent requests. |
| |
463 | */ |
| |
464 | if (errno != EEXIST) |
| |
465 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
| |
466 | locked_rc, strerror(errno), errno); |
| |
467 | return errno; |
| |
468 | } |
| |
469 | idx = cgit_repolist.count; |
| |
470 | scan_tree(path); |
| |
471 | print_repolist(f, &cgit_repolist, idx); |
| |
472 | if (rename(locked_rc, cached_rc)) |
| |
473 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
| |
474 | locked_rc, cached_rc, strerror(errno), errno); |
| |
475 | fclose(f); |
| |
476 | return 0; |
| |
477 | } |
| |
478 | |
| |
479 | static void process_cached_repolist(const char *path) |
| |
480 | { |
| |
481 | struct stat st; |
| |
482 | char *cached_rc; |
| |
483 | time_t age; |
| |
484 | |
| |
485 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
| |
486 | hash_str(path))); |
| |
487 | |
| |
488 | if (stat(cached_rc, &st)) { |
| |
489 | /* Nothing is cached, we need to scan without forking. And |
| |
490 | * if we fail to generate a cached repolist, we need to |
| |
491 | * invoke scan_tree manually. |
| |
492 | */ |
| |
493 | if (generate_cached_repolist(path, cached_rc)) |
| |
494 | scan_tree(path); |
| |
495 | return; |
| |
496 | } |
| |
497 | |
| |
498 | parse_configfile(cached_rc, config_cb); |
| |
499 | |
| |
500 | /* If the cached configfile hasn't expired, lets exit now */ |
| |
501 | age = time(NULL) - st.st_mtime; |
| |
502 | if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) |
| |
503 | return; |
| |
504 | |
| |
505 | /* The cached repolist has been parsed, but it was old. So lets |
| |
506 | * rescan the specified path and generate a new cached repolist |
| |
507 | * in a child-process to avoid latency for the current request. |
| |
508 | */ |
| |
509 | if (fork()) |
| |
510 | return; |
| |
511 | |
| |
512 | exit(generate_cached_repolist(path, cached_rc)); |
| |
513 | } |
441 | |
514 | |
442 | static void cgit_parse_args(int argc, const char **argv) |
515 | static void cgit_parse_args(int argc, const char **argv) |
443 | { |
516 | { |
444 | int i; |
517 | int i; |
445 | int scan = 0; |
518 | int scan = 0; |
446 | |
519 | |
447 | for (i = 1; i < argc; i++) { |
520 | for (i = 1; i < argc; i++) { |
448 | if (!strncmp(argv[i], "--cache=", 8)) { |
521 | if (!strncmp(argv[i], "--cache=", 8)) { |
449 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
522 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
450 | } |
523 | } |
451 | if (!strcmp(argv[i], "--nocache")) { |
524 | if (!strcmp(argv[i], "--nocache")) { |
452 | ctx.cfg.nocache = 1; |
525 | ctx.cfg.nocache = 1; |
453 | } |
526 | } |
454 | if (!strcmp(argv[i], "--nohttp")) { |
527 | if (!strcmp(argv[i], "--nohttp")) { |
455 | ctx.env.no_http = "1"; |
528 | ctx.env.no_http = "1"; |
456 | } |
529 | } |
|
|
diff --git a/cgit.h b/cgit.h index adb8da4..5659580 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -155,32 +155,33 @@ struct cgit_config { |
155 | char *index_info; |
155 | char *index_info; |
156 | char *logo; |
156 | char *logo; |
157 | char *logo_link; |
157 | char *logo_link; |
158 | char *module_link; |
158 | char *module_link; |
159 | char *repo_group; |
159 | char *repo_group; |
160 | char *robots; |
160 | char *robots; |
161 | char *root_title; |
161 | char *root_title; |
162 | char *root_desc; |
162 | char *root_desc; |
163 | char *root_readme; |
163 | char *root_readme; |
164 | char *script_name; |
164 | char *script_name; |
165 | char *virtual_root; |
165 | char *virtual_root; |
166 | int cache_size; |
166 | int cache_size; |
167 | int cache_dynamic_ttl; |
167 | int cache_dynamic_ttl; |
168 | int cache_max_create_time; |
168 | int cache_max_create_time; |
169 | int cache_repo_ttl; |
169 | int cache_repo_ttl; |
170 | int cache_root_ttl; |
170 | int cache_root_ttl; |
| |
171 | int cache_scanrc_ttl; |
171 | int cache_static_ttl; |
172 | int cache_static_ttl; |
172 | int embedded; |
173 | int embedded; |
173 | int enable_index_links; |
174 | int enable_index_links; |
174 | int enable_log_filecount; |
175 | int enable_log_filecount; |
175 | int enable_log_linecount; |
176 | int enable_log_linecount; |
176 | int local_time; |
177 | int local_time; |
177 | int max_repo_count; |
178 | int max_repo_count; |
178 | int max_commit_count; |
179 | int max_commit_count; |
179 | int max_lock_attempts; |
180 | int max_lock_attempts; |
180 | int max_msg_len; |
181 | int max_msg_len; |
181 | int max_repodesc_len; |
182 | int max_repodesc_len; |
182 | int max_stats; |
183 | int max_stats; |
183 | int nocache; |
184 | int nocache; |
184 | int noplainemail; |
185 | int noplainemail; |
185 | int noheader; |
186 | int noheader; |
186 | int renamelimit; |
187 | int renamelimit; |
|