|
diff --git a/cgit.c b/cgit.c index ab25b6a..fde0757 100644 --- a/ cgit.c+++ b/ cgit.c |
|
| @@ -149,13 +149,13 @@ void config_cb(const char *name, const char *value) |
| 149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
| 150 | else if (!strcmp(name, "max-stats")) |
150 | else if (!strcmp(name, "max-stats")) |
| 151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
| 152 | else if (!strcmp(name, "cache-size")) |
152 | else if (!strcmp(name, "cache-size")) |
| 153 | ctx.cfg.cache_size = atoi(value); |
153 | ctx.cfg.cache_size = atoi(value); |
| 154 | else if (!strcmp(name, "cache-root")) |
154 | else if (!strcmp(name, "cache-root")) |
| 155 | ctx.cfg.cache_root = xstrdup(value); |
155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
| 156 | else if (!strcmp(name, "cache-root-ttl")) |
156 | else if (!strcmp(name, "cache-root-ttl")) |
| 157 | ctx.cfg.cache_root_ttl = atoi(value); |
157 | ctx.cfg.cache_root_ttl = atoi(value); |
| 158 | else if (!strcmp(name, "cache-repo-ttl")) |
158 | else if (!strcmp(name, "cache-repo-ttl")) |
| 159 | ctx.cfg.cache_repo_ttl = atoi(value); |
159 | ctx.cfg.cache_repo_ttl = atoi(value); |
| 160 | else if (!strcmp(name, "cache-scanrc-ttl")) |
160 | else if (!strcmp(name, "cache-scanrc-ttl")) |
| 161 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
161 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
| @@ -180,15 +180,15 @@ void config_cb(const char *name, const char *value) |
| 180 | else if (!strcmp(name, "max-repo-count")) |
180 | else if (!strcmp(name, "max-repo-count")) |
| 181 | ctx.cfg.max_repo_count = atoi(value); |
181 | ctx.cfg.max_repo_count = atoi(value); |
| 182 | else if (!strcmp(name, "max-commit-count")) |
182 | else if (!strcmp(name, "max-commit-count")) |
| 183 | ctx.cfg.max_commit_count = atoi(value); |
183 | ctx.cfg.max_commit_count = atoi(value); |
| 184 | else if (!strcmp(name, "scan-path")) |
184 | else if (!strcmp(name, "scan-path")) |
| 185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
| 186 | process_cached_repolist(value); |
186 | process_cached_repolist(expand_macros(value)); |
| 187 | else |
187 | else |
| 188 | scan_tree(value, repo_config); |
188 | scan_tree(expand_macros(value), repo_config); |
| 189 | else if (!strcmp(name, "source-filter")) |
189 | else if (!strcmp(name, "source-filter")) |
| 190 | ctx.cfg.source_filter = new_filter(value, 1); |
190 | ctx.cfg.source_filter = new_filter(value, 1); |
| 191 | else if (!strcmp(name, "summary-log")) |
191 | else if (!strcmp(name, "summary-log")) |
| 192 | ctx.cfg.summary_log = atoi(value); |
192 | ctx.cfg.summary_log = atoi(value); |
| 193 | else if (!strcmp(name, "summary-branches")) |
193 | else if (!strcmp(name, "summary-branches")) |
| 194 | ctx.cfg.summary_branches = atoi(value); |
194 | ctx.cfg.summary_branches = atoi(value); |
| @@ -206,13 +206,13 @@ void config_cb(const char *name, const char *value) |
| 206 | ctx.cfg.clone_prefix = xstrdup(value); |
206 | ctx.cfg.clone_prefix = xstrdup(value); |
| 207 | else if (!strcmp(name, "local-time")) |
207 | else if (!strcmp(name, "local-time")) |
| 208 | ctx.cfg.local_time = atoi(value); |
208 | ctx.cfg.local_time = atoi(value); |
| 209 | else if (!prefixcmp(name, "mimetype.")) |
209 | else if (!prefixcmp(name, "mimetype.")) |
| 210 | add_mimetype(name + 9, value); |
210 | add_mimetype(name + 9, value); |
| 211 | else if (!strcmp(name, "include")) |
211 | else if (!strcmp(name, "include")) |
| 212 | parse_configfile(value, config_cb); |
212 | parse_configfile(expand_macros(value), config_cb); |
| 213 | } |
213 | } |
| 214 | |
214 | |
| 215 | static void querystring_cb(const char *name, const char *value) |
215 | static void querystring_cb(const char *name, const char *value) |
| 216 | { |
216 | { |
| 217 | if (!value) |
217 | if (!value) |
| 218 | value = ""; |
218 | value = ""; |
| @@ -702,13 +702,13 @@ int main(int argc, const char **argv) |
| 702 | prepare_context(&ctx); |
702 | prepare_context(&ctx); |
| 703 | cgit_repolist.length = 0; |
703 | cgit_repolist.length = 0; |
| 704 | cgit_repolist.count = 0; |
704 | cgit_repolist.count = 0; |
| 705 | cgit_repolist.repos = NULL; |
705 | cgit_repolist.repos = NULL; |
| 706 | |
706 | |
| 707 | cgit_parse_args(argc, argv); |
707 | cgit_parse_args(argc, argv); |
| 708 | parse_configfile(ctx.env.cgit_config, config_cb); |
708 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
| 709 | ctx.repo = NULL; |
709 | ctx.repo = NULL; |
| 710 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
710 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
| 711 | |
711 | |
| 712 | /* If virtual-root isn't specified in cgitrc, lets pretend |
712 | /* If virtual-root isn't specified in cgitrc, lets pretend |
| 713 | * that virtual-root equals SCRIPT_NAME. |
713 | * that virtual-root equals SCRIPT_NAME. |
| 714 | */ |
714 | */ |
|
