|
diff --git a/cgit.c b/cgit.c index 6e5215e..608cab6 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -7,16 +7,17 @@ |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "cache.h" |
10 | #include "cache.h" |
11 | #include "cmd.h" |
11 | #include "cmd.h" |
12 | #include "configfile.h" |
12 | #include "configfile.h" |
13 | #include "html.h" |
13 | #include "html.h" |
14 | #include "ui-shared.h" |
14 | #include "ui-shared.h" |
| |
15 | #include "ui-stats.h" |
15 | #include "scan-tree.h" |
16 | #include "scan-tree.h" |
16 | |
17 | |
17 | const char *cgit_version = CGIT_VERSION; |
18 | const char *cgit_version = CGIT_VERSION; |
18 | |
19 | |
19 | void config_cb(const char *name, const char *value) |
20 | void config_cb(const char *name, const char *value) |
20 | { |
21 | { |
21 | if (!strcmp(name, "root-title")) |
22 | if (!strcmp(name, "root-title")) |
22 | ctx.cfg.root_title = xstrdup(value); |
23 | ctx.cfg.root_title = xstrdup(value); |
@@ -49,16 +50,18 @@ void config_cb(const char *name, const char *value) |
49 | else if (!strcmp(name, "snapshots")) |
50 | else if (!strcmp(name, "snapshots")) |
50 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
51 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
51 | else if (!strcmp(name, "enable-index-links")) |
52 | else if (!strcmp(name, "enable-index-links")) |
52 | ctx.cfg.enable_index_links = atoi(value); |
53 | ctx.cfg.enable_index_links = atoi(value); |
53 | else if (!strcmp(name, "enable-log-filecount")) |
54 | else if (!strcmp(name, "enable-log-filecount")) |
54 | ctx.cfg.enable_log_filecount = atoi(value); |
55 | ctx.cfg.enable_log_filecount = atoi(value); |
55 | else if (!strcmp(name, "enable-log-linecount")) |
56 | else if (!strcmp(name, "enable-log-linecount")) |
56 | ctx.cfg.enable_log_linecount = atoi(value); |
57 | ctx.cfg.enable_log_linecount = atoi(value); |
| |
58 | else if (!strcmp(name, "max-stats")) |
| |
59 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
57 | else if (!strcmp(name, "cache-size")) |
60 | else if (!strcmp(name, "cache-size")) |
58 | ctx.cfg.cache_size = atoi(value); |
61 | ctx.cfg.cache_size = atoi(value); |
59 | else if (!strcmp(name, "cache-root")) |
62 | else if (!strcmp(name, "cache-root")) |
60 | ctx.cfg.cache_root = xstrdup(value); |
63 | ctx.cfg.cache_root = xstrdup(value); |
61 | else if (!strcmp(name, "cache-root-ttl")) |
64 | else if (!strcmp(name, "cache-root-ttl")) |
62 | ctx.cfg.cache_root_ttl = atoi(value); |
65 | ctx.cfg.cache_root_ttl = atoi(value); |
63 | else if (!strcmp(name, "cache-repo-ttl")) |
66 | else if (!strcmp(name, "cache-repo-ttl")) |
64 | ctx.cfg.cache_repo_ttl = atoi(value); |
67 | ctx.cfg.cache_repo_ttl = atoi(value); |
@@ -107,16 +110,18 @@ void config_cb(const char *name, const char *value) |
107 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
110 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
108 | ctx.repo->defbranch = xstrdup(value); |
111 | ctx.repo->defbranch = xstrdup(value); |
109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
112 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
113 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
114 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
115 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
116 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
117 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
118 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
| |
119 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
120 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
116 | ctx.repo->module_link= xstrdup(value); |
121 | ctx.repo->module_link= xstrdup(value); |
117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
122 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
118 | if (*value == '/') |
123 | if (*value == '/') |
119 | ctx.repo->readme = xstrdup(value); |
124 | ctx.repo->readme = xstrdup(value); |
120 | else |
125 | else |
121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
126 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
122 | } else if (!strcmp(name, "include")) |
127 | } else if (!strcmp(name, "include")) |
@@ -149,16 +154,22 @@ static void querystring_cb(const char *name, const char *value) |
149 | } else if (!strcmp(name, "ofs")) { |
154 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); |
155 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { |
156 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); |
157 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { |
158 | } else if (!strcmp(name, "name")) { |
154 | ctx.qry.name = xstrdup(value); |
159 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { |
160 | } else if (!strcmp(name, "mimetype")) { |
156 | ctx.qry.mimetype = xstrdup(value); |
161 | ctx.qry.mimetype = xstrdup(value); |
| |
162 | } else if (!strcmp(name, "s")){ |
| |
163 | ctx.qry.sort = xstrdup(value); |
| |
164 | } else if (!strcmp(name, "showmsg")) { |
| |
165 | ctx.qry.showmsg = atoi(value); |
| |
166 | } else if (!strcmp(name, "period")) { |
| |
167 | ctx.qry.period = xstrdup(value); |
157 | } |
168 | } |
158 | } |
169 | } |
159 | |
170 | |
160 | static void prepare_context(struct cgit_context *ctx) |
171 | static void prepare_context(struct cgit_context *ctx) |
161 | { |
172 | { |
162 | memset(ctx, 0, sizeof(ctx)); |
173 | memset(ctx, 0, sizeof(ctx)); |
163 | ctx->cfg.agefile = "info/web/last-modified"; |
174 | ctx->cfg.agefile = "info/web/last-modified"; |
164 | ctx->cfg.nocache = 0; |
175 | ctx->cfg.nocache = 0; |
@@ -172,16 +183,17 @@ static void prepare_context(struct cgit_context *ctx) |
172 | ctx->cfg.css = "/cgit.css"; |
183 | ctx->cfg.css = "/cgit.css"; |
173 | ctx->cfg.logo = "/git-logo.png"; |
184 | ctx->cfg.logo = "/git-logo.png"; |
174 | ctx->cfg.local_time = 0; |
185 | ctx->cfg.local_time = 0; |
175 | ctx->cfg.max_repo_count = 50; |
186 | ctx->cfg.max_repo_count = 50; |
176 | ctx->cfg.max_commit_count = 50; |
187 | ctx->cfg.max_commit_count = 50; |
177 | ctx->cfg.max_lock_attempts = 5; |
188 | ctx->cfg.max_lock_attempts = 5; |
178 | ctx->cfg.max_msg_len = 80; |
189 | ctx->cfg.max_msg_len = 80; |
179 | ctx->cfg.max_repodesc_len = 80; |
190 | ctx->cfg.max_repodesc_len = 80; |
| |
191 | ctx->cfg.max_stats = 0; |
180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
192 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
181 | ctx->cfg.renamelimit = -1; |
193 | ctx->cfg.renamelimit = -1; |
182 | ctx->cfg.robots = "index, nofollow"; |
194 | ctx->cfg.robots = "index, nofollow"; |
183 | ctx->cfg.root_title = "Git repository browser"; |
195 | ctx->cfg.root_title = "Git repository browser"; |
184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
196 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
197 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
186 | ctx->cfg.summary_branches = 10; |
198 | ctx->cfg.summary_branches = 10; |
187 | ctx->cfg.summary_log = 10; |
199 | ctx->cfg.summary_log = 10; |
@@ -429,38 +441,39 @@ int main(int argc, const char **argv) |
429 | if (getenv("QUERY_STRING")) |
441 | if (getenv("QUERY_STRING")) |
430 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
442 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
431 | cgit_parse_args(argc, argv); |
443 | cgit_parse_args(argc, argv); |
432 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
444 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
433 | config_cb); |
445 | config_cb); |
434 | ctx.repo = NULL; |
446 | ctx.repo = NULL; |
435 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
447 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
436 | |
448 | |
437 | /* If virtual-root isn't specified in cgitrc and no url |
449 | /* If virtual-root isn't specified in cgitrc, lets pretend |
438 | * parameter is specified on the querystring, lets pretend |
450 | * that virtual-root equals SCRIPT_NAME. |
439 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as |
| |
440 | * url. This allows cgit to work with virtual urls without |
| |
441 | * the need for rewriterules in the webserver (as long as |
| |
442 | * PATH_INFO is included in the cache lookup key). |
| |
443 | */ |
451 | */ |
444 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { |
452 | if (!ctx.cfg.virtual_root) |
445 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
453 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
446 | path = getenv("PATH_INFO"); |
454 | |
447 | if (path) { |
455 | /* If no url parameter is specified on the querystring, lets |
448 | if (path[0] == '/') |
456 | * use PATH_INFO as url. This allows cgit to work with virtual |
449 | path++; |
457 | * urls without the need for rewriterules in the webserver (as |
450 | ctx.qry.url = xstrdup(path); |
458 | * long as PATH_INFO is included in the cache lookup key). |
451 | if (ctx.qry.raw) { |
459 | */ |
452 | qry = ctx.qry.raw; |
460 | path = getenv("PATH_INFO"); |
453 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
461 | if (!ctx.qry.url && path) { |
454 | free(qry); |
462 | if (path[0] == '/') |
455 | } else |
463 | path++; |
456 | ctx.qry.raw = ctx.qry.url; |
464 | ctx.qry.url = xstrdup(path); |
457 | cgit_parse_url(ctx.qry.url); |
465 | if (ctx.qry.raw) { |
458 | } |
466 | qry = ctx.qry.raw; |
| |
467 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
| |
468 | free(qry); |
| |
469 | } else |
| |
470 | ctx.qry.raw = ctx.qry.url; |
| |
471 | cgit_parse_url(ctx.qry.url); |
459 | } |
472 | } |
460 | |
473 | |
461 | ttl = calc_ttl(); |
474 | ttl = calc_ttl(); |
462 | ctx.page.expires += ttl*60; |
475 | ctx.page.expires += ttl*60; |
463 | if (ctx.cfg.nocache) |
476 | if (ctx.cfg.nocache) |
464 | ctx.cfg.cache_size = 0; |
477 | ctx.cfg.cache_size = 0; |
465 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
478 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
466 | ctx.qry.raw, ttl, process_request, &ctx); |
479 | ctx.qry.raw, ttl, process_request, &ctx); |
|