|
diff --git a/cgit.c b/cgit.c index 6c7e811..96900bb 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -3,2 +3,3 @@ |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
| |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> |
4 | * |
5 | * |
@@ -23,3 +24,3 @@ void add_mimetype(const char *name, const char *value) |
23 | |
24 | |
24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); |
25 | item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); |
25 | item->util = xstrdup(value); |
26 | item->util = xstrdup(value); |
@@ -62,2 +63,6 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
64 | else if (!strcmp(name, "enable-remote-branches")) |
| |
65 | repo->enable_remote_branches = atoi(value); |
| |
66 | else if (!strcmp(name, "enable-subject-links")) |
| |
67 | repo->enable_subject_links = atoi(value); |
63 | else if (!strcmp(name, "max-stats")) |
68 | else if (!strcmp(name, "max-stats")) |
@@ -69,6 +74,3 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
69 | else if (!strcmp(name, "readme") && value != NULL) { |
74 | else if (!strcmp(name, "readme") && value != NULL) { |
70 | if (*value == '/') |
75 | repo->readme = xstrdup(value); |
71 | repo->readme = xstrdup(value); |
| |
72 | else |
| |
73 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
| |
74 | } else if (ctx.cfg.enable_filter_overrides) { |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
@@ -93,2 +95,4 @@ void config_cb(const char *name, const char *value) |
93 | repo_config(ctx.repo, name + 5, value); |
95 | repo_config(ctx.repo, name + 5, value); |
| |
96 | else if (!strcmp(name, "readme")) |
| |
97 | ctx.cfg.readme = xstrdup(value); |
94 | else if (!strcmp(name, "root-title")) |
98 | else if (!strcmp(name, "root-title")) |
@@ -133,2 +137,4 @@ void config_cb(const char *name, const char *value) |
133 | ctx.cfg.enable_filter_overrides = atoi(value); |
137 | ctx.cfg.enable_filter_overrides = atoi(value); |
| |
138 | else if (!strcmp(name, "enable-gitweb-owner")) |
| |
139 | ctx.cfg.enable_gitweb_owner = atoi(value); |
134 | else if (!strcmp(name, "enable-index-links")) |
140 | else if (!strcmp(name, "enable-index-links")) |
@@ -139,2 +145,6 @@ void config_cb(const char *name, const char *value) |
139 | ctx.cfg.enable_log_linecount = atoi(value); |
145 | ctx.cfg.enable_log_linecount = atoi(value); |
| |
146 | else if (!strcmp(name, "enable-remote-branches")) |
| |
147 | ctx.cfg.enable_remote_branches = atoi(value); |
| |
148 | else if (!strcmp(name, "enable-subject-links")) |
| |
149 | ctx.cfg.enable_subject_links = atoi(value); |
140 | else if (!strcmp(name, "enable-tree-linenumbers")) |
150 | else if (!strcmp(name, "enable-tree-linenumbers")) |
@@ -146,3 +156,3 @@ void config_cb(const char *name, const char *value) |
146 | else if (!strcmp(name, "cache-root")) |
156 | else if (!strcmp(name, "cache-root")) |
147 | ctx.cfg.cache_root = xstrdup(value); |
157 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
148 | else if (!strcmp(name, "cache-root-ttl")) |
158 | else if (!strcmp(name, "cache-root-ttl")) |
@@ -163,2 +173,4 @@ void config_cb(const char *name, const char *value) |
163 | ctx.cfg.embedded = atoi(value); |
173 | ctx.cfg.embedded = atoi(value); |
| |
174 | else if (!strcmp(name, "max-atom-items")) |
| |
175 | ctx.cfg.max_atom_items = atoi(value); |
164 | else if (!strcmp(name, "max-message-length")) |
176 | else if (!strcmp(name, "max-message-length")) |
@@ -167,2 +179,4 @@ void config_cb(const char *name, const char *value) |
167 | ctx.cfg.max_repodesc_len = atoi(value); |
179 | ctx.cfg.max_repodesc_len = atoi(value); |
| |
180 | else if (!strcmp(name, "max-blob-size")) |
| |
181 | ctx.cfg.max_blob_size = atoi(value); |
168 | else if (!strcmp(name, "max-repo-count")) |
182 | else if (!strcmp(name, "max-repo-count")) |
@@ -171,7 +185,14 @@ void config_cb(const char *name, const char *value) |
171 | ctx.cfg.max_commit_count = atoi(value); |
185 | ctx.cfg.max_commit_count = atoi(value); |
| |
186 | else if (!strcmp(name, "project-list")) |
| |
187 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
172 | else if (!strcmp(name, "scan-path")) |
188 | else if (!strcmp(name, "scan-path")) |
173 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
189 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
174 | process_cached_repolist(value); |
190 | process_cached_repolist(expand_macros(value)); |
| |
191 | else if (ctx.cfg.project_list) |
| |
192 | scan_projects(expand_macros(value), |
| |
193 | ctx.cfg.project_list, repo_config); |
175 | else |
194 | else |
176 | scan_tree(value, repo_config); |
195 | scan_tree(expand_macros(value), repo_config); |
| |
196 | else if (!strcmp(name, "section-from-path")) |
| |
197 | ctx.cfg.section_from_path = atoi(value); |
177 | else if (!strcmp(name, "source-filter")) |
198 | else if (!strcmp(name, "source-filter")) |
@@ -184,2 +205,4 @@ void config_cb(const char *name, const char *value) |
184 | ctx.cfg.summary_tags = atoi(value); |
205 | ctx.cfg.summary_tags = atoi(value); |
| |
206 | else if (!strcmp(name, "side-by-side-diffs")) |
| |
207 | ctx.cfg.ssdiff = atoi(value); |
185 | else if (!strcmp(name, "agefile")) |
208 | else if (!strcmp(name, "agefile")) |
@@ -188,2 +211,4 @@ void config_cb(const char *name, const char *value) |
188 | ctx.cfg.renamelimit = atoi(value); |
211 | ctx.cfg.renamelimit = atoi(value); |
| |
212 | else if (!strcmp(name, "remove-suffix")) |
| |
213 | ctx.cfg.remove_suffix = atoi(value); |
189 | else if (!strcmp(name, "robots")) |
214 | else if (!strcmp(name, "robots")) |
@@ -197,3 +222,3 @@ void config_cb(const char *name, const char *value) |
197 | else if (!strcmp(name, "include")) |
222 | else if (!strcmp(name, "include")) |
198 | parse_configfile(value, config_cb); |
223 | parse_configfile(expand_macros(value), config_cb); |
199 | } |
224 | } |
@@ -211,2 +236,4 @@ static void querystring_cb(const char *name, const char *value) |
211 | } else if (!strcmp(name, "url")) { |
236 | } else if (!strcmp(name, "url")) { |
| |
237 | if (*value == '/') |
| |
238 | value++; |
212 | ctx.qry.url = xstrdup(value); |
239 | ctx.qry.url = xstrdup(value); |
@@ -240,2 +267,10 @@ static void querystring_cb(const char *name, const char *value) |
240 | ctx.qry.period = xstrdup(value); |
267 | ctx.qry.period = xstrdup(value); |
| |
268 | } else if (!strcmp(name, "ss")) { |
| |
269 | ctx.qry.ssdiff = atoi(value); |
| |
270 | } else if (!strcmp(name, "all")) { |
| |
271 | ctx.qry.show_all = atoi(value); |
| |
272 | } else if (!strcmp(name, "context")) { |
| |
273 | ctx.qry.context = atoi(value); |
| |
274 | } else if (!strcmp(name, "ignorews")) { |
| |
275 | ctx.qry.ignorews = atoi(value); |
241 | } |
276 | } |
@@ -264,2 +299,3 @@ static void prepare_context(struct cgit_context *ctx) |
264 | ctx->cfg.local_time = 0; |
299 | ctx->cfg.local_time = 0; |
| |
300 | ctx->cfg.enable_gitweb_owner = 1; |
265 | ctx->cfg.enable_tree_linenumbers = 1; |
301 | ctx->cfg.enable_tree_linenumbers = 1; |
@@ -270,5 +306,8 @@ static void prepare_context(struct cgit_context *ctx) |
270 | ctx->cfg.max_repodesc_len = 80; |
306 | ctx->cfg.max_repodesc_len = 80; |
| |
307 | ctx->cfg.max_blob_size = 0; |
271 | ctx->cfg.max_stats = 0; |
308 | ctx->cfg.max_stats = 0; |
272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
309 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
| |
310 | ctx->cfg.project_list = NULL; |
273 | ctx->cfg.renamelimit = -1; |
311 | ctx->cfg.renamelimit = -1; |
| |
312 | ctx->cfg.remove_suffix = 0; |
274 | ctx->cfg.robots = "index, nofollow"; |
313 | ctx->cfg.robots = "index, nofollow"; |
@@ -281,2 +320,4 @@ static void prepare_context(struct cgit_context *ctx) |
281 | ctx->cfg.summary_tags = 10; |
320 | ctx->cfg.summary_tags = 10; |
| |
321 | ctx->cfg.max_atom_items = 10; |
| |
322 | ctx->cfg.ssdiff = 0; |
282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
323 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
@@ -412,2 +453,8 @@ static void process_request(void *cbdata) |
412 | |
453 | |
| |
454 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" |
| |
455 | * in-project path limit to be made available at ctx->qry.vpath. |
| |
456 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). |
| |
457 | */ |
| |
458 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; |
| |
459 | |
413 | if (cmd->want_repo && !ctx->repo) { |
460 | if (cmd->want_repo && !ctx->repo) { |
@@ -543,3 +590,6 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) |
543 | idx = cgit_repolist.count; |
590 | idx = cgit_repolist.count; |
544 | scan_tree(path, repo_config); |
591 | if (ctx.cfg.project_list) |
| |
592 | scan_projects(path, ctx.cfg.project_list, repo_config); |
| |
593 | else |
| |
594 | scan_tree(path, repo_config); |
545 | print_repolist(f, &cgit_repolist, idx); |
595 | print_repolist(f, &cgit_repolist, idx); |
@@ -557,5 +607,8 @@ static void process_cached_repolist(const char *path) |
557 | time_t age; |
607 | time_t age; |
| |
608 | unsigned long hash; |
558 | |
609 | |
559 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
610 | hash = hash_str(path); |
560 | hash_str(path))); |
611 | if (ctx.cfg.project_list) |
| |
612 | hash += hash_str(ctx.cfg.project_list); |
| |
613 | cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash)); |
561 | |
614 | |
@@ -566,4 +619,9 @@ static void process_cached_repolist(const char *path) |
566 | */ |
619 | */ |
567 | if (generate_cached_repolist(path, cached_rc)) |
620 | if (generate_cached_repolist(path, cached_rc)) { |
568 | scan_tree(path, repo_config); |
621 | if (ctx.cfg.project_list) |
| |
622 | scan_projects(path, ctx.cfg.project_list, |
| |
623 | repo_config); |
| |
624 | else |
| |
625 | scan_tree(path, repo_config); |
| |
626 | } |
569 | return; |
627 | return; |
@@ -676,3 +734,3 @@ int main(int argc, const char **argv) |
676 | cgit_parse_args(argc, argv); |
734 | cgit_parse_args(argc, argv); |
677 | parse_configfile(ctx.env.cgit_config, config_cb); |
735 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
678 | ctx.repo = NULL; |
736 | ctx.repo = NULL; |
|