|
diff --git a/cgit.c b/cgit.c index f9a42bb..eff5b7a 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -114,48 +114,50 @@ void config_cb(const char *name, const char *value) |
114 | else if (!strcmp(name, "logo")) |
114 | else if (!strcmp(name, "logo")) |
115 | ctx.cfg.logo = xstrdup(value); |
115 | ctx.cfg.logo = xstrdup(value); |
116 | else if (!strcmp(name, "index-header")) |
116 | else if (!strcmp(name, "index-header")) |
117 | ctx.cfg.index_header = xstrdup(value); |
117 | ctx.cfg.index_header = xstrdup(value); |
118 | else if (!strcmp(name, "index-info")) |
118 | else if (!strcmp(name, "index-info")) |
119 | ctx.cfg.index_info = xstrdup(value); |
119 | ctx.cfg.index_info = xstrdup(value); |
120 | else if (!strcmp(name, "logo-link")) |
120 | else if (!strcmp(name, "logo-link")) |
121 | ctx.cfg.logo_link = xstrdup(value); |
121 | ctx.cfg.logo_link = xstrdup(value); |
122 | else if (!strcmp(name, "module-link")) |
122 | else if (!strcmp(name, "module-link")) |
123 | ctx.cfg.module_link = xstrdup(value); |
123 | ctx.cfg.module_link = xstrdup(value); |
124 | else if (!strcmp(name, "virtual-root")) { |
124 | else if (!strcmp(name, "virtual-root")) { |
125 | ctx.cfg.virtual_root = trim_end(value, '/'); |
125 | ctx.cfg.virtual_root = trim_end(value, '/'); |
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
127 | ctx.cfg.virtual_root = ""; |
127 | ctx.cfg.virtual_root = ""; |
128 | } else if (!strcmp(name, "nocache")) |
128 | } else if (!strcmp(name, "nocache")) |
129 | ctx.cfg.nocache = atoi(value); |
129 | ctx.cfg.nocache = atoi(value); |
130 | else if (!strcmp(name, "noplainemail")) |
130 | else if (!strcmp(name, "noplainemail")) |
131 | ctx.cfg.noplainemail = atoi(value); |
131 | ctx.cfg.noplainemail = atoi(value); |
132 | else if (!strcmp(name, "noheader")) |
132 | else if (!strcmp(name, "noheader")) |
133 | ctx.cfg.noheader = atoi(value); |
133 | ctx.cfg.noheader = atoi(value); |
134 | else if (!strcmp(name, "snapshots")) |
134 | else if (!strcmp(name, "snapshots")) |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
136 | else if (!strcmp(name, "enable-filter-overrides")) |
136 | else if (!strcmp(name, "enable-filter-overrides")) |
137 | 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); |
138 | else if (!strcmp(name, "enable-index-links")) |
140 | else if (!strcmp(name, "enable-index-links")) |
139 | ctx.cfg.enable_index_links = atoi(value); |
141 | ctx.cfg.enable_index_links = atoi(value); |
140 | else if (!strcmp(name, "enable-log-filecount")) |
142 | else if (!strcmp(name, "enable-log-filecount")) |
141 | ctx.cfg.enable_log_filecount = atoi(value); |
143 | ctx.cfg.enable_log_filecount = atoi(value); |
142 | else if (!strcmp(name, "enable-log-linecount")) |
144 | else if (!strcmp(name, "enable-log-linecount")) |
143 | ctx.cfg.enable_log_linecount = atoi(value); |
145 | ctx.cfg.enable_log_linecount = atoi(value); |
144 | else if (!strcmp(name, "enable-remote-branches")) |
146 | else if (!strcmp(name, "enable-remote-branches")) |
145 | ctx.cfg.enable_remote_branches = atoi(value); |
147 | ctx.cfg.enable_remote_branches = atoi(value); |
146 | else if (!strcmp(name, "enable-subject-links")) |
148 | else if (!strcmp(name, "enable-subject-links")) |
147 | ctx.cfg.enable_subject_links = atoi(value); |
149 | ctx.cfg.enable_subject_links = atoi(value); |
148 | else if (!strcmp(name, "enable-tree-linenumbers")) |
150 | else if (!strcmp(name, "enable-tree-linenumbers")) |
149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
151 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
150 | else if (!strcmp(name, "max-stats")) |
152 | else if (!strcmp(name, "max-stats")) |
151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
153 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
152 | else if (!strcmp(name, "cache-size")) |
154 | else if (!strcmp(name, "cache-size")) |
153 | ctx.cfg.cache_size = atoi(value); |
155 | ctx.cfg.cache_size = atoi(value); |
154 | else if (!strcmp(name, "cache-root")) |
156 | else if (!strcmp(name, "cache-root")) |
155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
157 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
156 | else if (!strcmp(name, "cache-root-ttl")) |
158 | else if (!strcmp(name, "cache-root-ttl")) |
157 | ctx.cfg.cache_root_ttl = atoi(value); |
159 | ctx.cfg.cache_root_ttl = atoi(value); |
158 | else if (!strcmp(name, "cache-repo-ttl")) |
160 | else if (!strcmp(name, "cache-repo-ttl")) |
159 | ctx.cfg.cache_repo_ttl = atoi(value); |
161 | ctx.cfg.cache_repo_ttl = atoi(value); |
160 | else if (!strcmp(name, "cache-scanrc-ttl")) |
162 | else if (!strcmp(name, "cache-scanrc-ttl")) |
161 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
163 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
@@ -272,48 +274,49 @@ static void querystring_cb(const char *name, const char *value) |
272 | } |
274 | } |
273 | } |
275 | } |
274 | |
276 | |
275 | char *xstrdupn(const char *str) |
277 | char *xstrdupn(const char *str) |
276 | { |
278 | { |
277 | return (str ? xstrdup(str) : NULL); |
279 | return (str ? xstrdup(str) : NULL); |
278 | } |
280 | } |
279 | |
281 | |
280 | static void prepare_context(struct cgit_context *ctx) |
282 | static void prepare_context(struct cgit_context *ctx) |
281 | { |
283 | { |
282 | memset(ctx, 0, sizeof(*ctx)); |
284 | memset(ctx, 0, sizeof(*ctx)); |
283 | ctx->cfg.agefile = "info/web/last-modified"; |
285 | ctx->cfg.agefile = "info/web/last-modified"; |
284 | ctx->cfg.nocache = 0; |
286 | ctx->cfg.nocache = 0; |
285 | ctx->cfg.cache_size = 0; |
287 | ctx->cfg.cache_size = 0; |
286 | ctx->cfg.cache_dynamic_ttl = 5; |
288 | ctx->cfg.cache_dynamic_ttl = 5; |
287 | ctx->cfg.cache_max_create_time = 5; |
289 | ctx->cfg.cache_max_create_time = 5; |
288 | ctx->cfg.cache_repo_ttl = 5; |
290 | ctx->cfg.cache_repo_ttl = 5; |
289 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
291 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
290 | ctx->cfg.cache_root_ttl = 5; |
292 | ctx->cfg.cache_root_ttl = 5; |
291 | ctx->cfg.cache_scanrc_ttl = 15; |
293 | ctx->cfg.cache_scanrc_ttl = 15; |
292 | ctx->cfg.cache_static_ttl = -1; |
294 | ctx->cfg.cache_static_ttl = -1; |
293 | ctx->cfg.css = "/cgit.css"; |
295 | ctx->cfg.css = "/cgit.css"; |
294 | ctx->cfg.logo = "/cgit.png"; |
296 | ctx->cfg.logo = "/cgit.png"; |
295 | ctx->cfg.local_time = 0; |
297 | ctx->cfg.local_time = 0; |
| |
298 | ctx->cfg.enable_gitweb_owner = 1; |
296 | ctx->cfg.enable_tree_linenumbers = 1; |
299 | ctx->cfg.enable_tree_linenumbers = 1; |
297 | ctx->cfg.max_repo_count = 50; |
300 | ctx->cfg.max_repo_count = 50; |
298 | ctx->cfg.max_commit_count = 50; |
301 | ctx->cfg.max_commit_count = 50; |
299 | ctx->cfg.max_lock_attempts = 5; |
302 | ctx->cfg.max_lock_attempts = 5; |
300 | ctx->cfg.max_msg_len = 80; |
303 | ctx->cfg.max_msg_len = 80; |
301 | ctx->cfg.max_repodesc_len = 80; |
304 | ctx->cfg.max_repodesc_len = 80; |
302 | ctx->cfg.max_blob_size = 0; |
305 | ctx->cfg.max_blob_size = 0; |
303 | ctx->cfg.max_stats = 0; |
306 | ctx->cfg.max_stats = 0; |
304 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
307 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
305 | ctx->cfg.project_list = NULL; |
308 | ctx->cfg.project_list = NULL; |
306 | ctx->cfg.renamelimit = -1; |
309 | ctx->cfg.renamelimit = -1; |
307 | ctx->cfg.remove_suffix = 0; |
310 | ctx->cfg.remove_suffix = 0; |
308 | ctx->cfg.robots = "index, nofollow"; |
311 | ctx->cfg.robots = "index, nofollow"; |
309 | ctx->cfg.root_title = "Git repository browser"; |
312 | ctx->cfg.root_title = "Git repository browser"; |
310 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
313 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
311 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
314 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
312 | ctx->cfg.section = ""; |
315 | ctx->cfg.section = ""; |
313 | ctx->cfg.summary_branches = 10; |
316 | ctx->cfg.summary_branches = 10; |
314 | ctx->cfg.summary_log = 10; |
317 | ctx->cfg.summary_log = 10; |
315 | ctx->cfg.summary_tags = 10; |
318 | ctx->cfg.summary_tags = 10; |
316 | ctx->cfg.max_atom_items = 10; |
319 | ctx->cfg.max_atom_items = 10; |
317 | ctx->cfg.ssdiff = 0; |
320 | ctx->cfg.ssdiff = 0; |
318 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
321 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
319 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
322 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
|