|
diff --git a/cgit.c b/cgit.c index 412fbf0..6a76281 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -150,96 +150,98 @@ void config_cb(const char *name, const char *value) |
150 | else if (!strcmp(name, "enable-subject-links")) |
150 | else if (!strcmp(name, "enable-subject-links")) |
151 | ctx.cfg.enable_subject_links = atoi(value); |
151 | ctx.cfg.enable_subject_links = atoi(value); |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
154 | else if (!strcmp(name, "max-stats")) |
154 | else if (!strcmp(name, "max-stats")) |
155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
156 | else if (!strcmp(name, "cache-size")) |
156 | else if (!strcmp(name, "cache-size")) |
157 | ctx.cfg.cache_size = atoi(value); |
157 | ctx.cfg.cache_size = atoi(value); |
158 | else if (!strcmp(name, "cache-root")) |
158 | else if (!strcmp(name, "cache-root")) |
159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
160 | else if (!strcmp(name, "cache-root-ttl")) |
160 | else if (!strcmp(name, "cache-root-ttl")) |
161 | ctx.cfg.cache_root_ttl = atoi(value); |
161 | ctx.cfg.cache_root_ttl = atoi(value); |
162 | else if (!strcmp(name, "cache-repo-ttl")) |
162 | else if (!strcmp(name, "cache-repo-ttl")) |
163 | ctx.cfg.cache_repo_ttl = atoi(value); |
163 | ctx.cfg.cache_repo_ttl = atoi(value); |
164 | else if (!strcmp(name, "cache-scanrc-ttl")) |
164 | else if (!strcmp(name, "cache-scanrc-ttl")) |
165 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
165 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
166 | else if (!strcmp(name, "cache-static-ttl")) |
166 | else if (!strcmp(name, "cache-static-ttl")) |
167 | ctx.cfg.cache_static_ttl = atoi(value); |
167 | ctx.cfg.cache_static_ttl = atoi(value); |
168 | else if (!strcmp(name, "cache-dynamic-ttl")) |
168 | else if (!strcmp(name, "cache-dynamic-ttl")) |
169 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
169 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
170 | else if (!strcmp(name, "about-filter")) |
170 | else if (!strcmp(name, "about-filter")) |
171 | ctx.cfg.about_filter = new_filter(value, 0); |
171 | ctx.cfg.about_filter = new_filter(value, 0); |
172 | else if (!strcmp(name, "commit-filter")) |
172 | else if (!strcmp(name, "commit-filter")) |
173 | ctx.cfg.commit_filter = new_filter(value, 0); |
173 | ctx.cfg.commit_filter = new_filter(value, 0); |
174 | else if (!strcmp(name, "embedded")) |
174 | else if (!strcmp(name, "embedded")) |
175 | ctx.cfg.embedded = atoi(value); |
175 | ctx.cfg.embedded = atoi(value); |
176 | else if (!strcmp(name, "max-atom-items")) |
176 | else if (!strcmp(name, "max-atom-items")) |
177 | ctx.cfg.max_atom_items = atoi(value); |
177 | ctx.cfg.max_atom_items = atoi(value); |
178 | else if (!strcmp(name, "max-message-length")) |
178 | else if (!strcmp(name, "max-message-length")) |
179 | ctx.cfg.max_msg_len = atoi(value); |
179 | ctx.cfg.max_msg_len = atoi(value); |
180 | else if (!strcmp(name, "max-repodesc-length")) |
180 | else if (!strcmp(name, "max-repodesc-length")) |
181 | ctx.cfg.max_repodesc_len = atoi(value); |
181 | ctx.cfg.max_repodesc_len = atoi(value); |
182 | else if (!strcmp(name, "max-blob-size")) |
182 | else if (!strcmp(name, "max-blob-size")) |
183 | ctx.cfg.max_blob_size = atoi(value); |
183 | ctx.cfg.max_blob_size = atoi(value); |
184 | else if (!strcmp(name, "max-repo-count")) |
184 | else if (!strcmp(name, "max-repo-count")) |
185 | ctx.cfg.max_repo_count = atoi(value); |
185 | ctx.cfg.max_repo_count = atoi(value); |
186 | else if (!strcmp(name, "max-commit-count")) |
186 | else if (!strcmp(name, "max-commit-count")) |
187 | ctx.cfg.max_commit_count = atoi(value); |
187 | ctx.cfg.max_commit_count = atoi(value); |
188 | else if (!strcmp(name, "project-list")) |
188 | else if (!strcmp(name, "project-list")) |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
190 | else if (!strcmp(name, "scan-path")) |
190 | else if (!strcmp(name, "scan-path")) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
192 | process_cached_repolist(expand_macros(value)); |
192 | process_cached_repolist(expand_macros(value)); |
193 | else if (ctx.cfg.project_list) |
193 | else if (ctx.cfg.project_list) |
194 | scan_projects(expand_macros(value), |
194 | scan_projects(expand_macros(value), |
195 | ctx.cfg.project_list, repo_config); |
195 | ctx.cfg.project_list, repo_config); |
196 | else |
196 | else |
197 | scan_tree(expand_macros(value), repo_config); |
197 | scan_tree(expand_macros(value), repo_config); |
| |
198 | else if (!strcmp(name, "scan-hidden-path")) |
| |
199 | ctx.cfg.scan_hidden_path = atoi(value); |
198 | else if (!strcmp(name, "section-from-path")) |
200 | else if (!strcmp(name, "section-from-path")) |
199 | ctx.cfg.section_from_path = atoi(value); |
201 | ctx.cfg.section_from_path = atoi(value); |
200 | else if (!strcmp(name, "source-filter")) |
202 | else if (!strcmp(name, "source-filter")) |
201 | ctx.cfg.source_filter = new_filter(value, 1); |
203 | ctx.cfg.source_filter = new_filter(value, 1); |
202 | else if (!strcmp(name, "summary-log")) |
204 | else if (!strcmp(name, "summary-log")) |
203 | ctx.cfg.summary_log = atoi(value); |
205 | ctx.cfg.summary_log = atoi(value); |
204 | else if (!strcmp(name, "summary-branches")) |
206 | else if (!strcmp(name, "summary-branches")) |
205 | ctx.cfg.summary_branches = atoi(value); |
207 | ctx.cfg.summary_branches = atoi(value); |
206 | else if (!strcmp(name, "summary-tags")) |
208 | else if (!strcmp(name, "summary-tags")) |
207 | ctx.cfg.summary_tags = atoi(value); |
209 | ctx.cfg.summary_tags = atoi(value); |
208 | else if (!strcmp(name, "side-by-side-diffs")) |
210 | else if (!strcmp(name, "side-by-side-diffs")) |
209 | ctx.cfg.ssdiff = atoi(value); |
211 | ctx.cfg.ssdiff = atoi(value); |
210 | else if (!strcmp(name, "agefile")) |
212 | else if (!strcmp(name, "agefile")) |
211 | ctx.cfg.agefile = xstrdup(value); |
213 | ctx.cfg.agefile = xstrdup(value); |
212 | else if (!strcmp(name, "renamelimit")) |
214 | else if (!strcmp(name, "renamelimit")) |
213 | ctx.cfg.renamelimit = atoi(value); |
215 | ctx.cfg.renamelimit = atoi(value); |
214 | else if (!strcmp(name, "remove-suffix")) |
216 | else if (!strcmp(name, "remove-suffix")) |
215 | ctx.cfg.remove_suffix = atoi(value); |
217 | ctx.cfg.remove_suffix = atoi(value); |
216 | else if (!strcmp(name, "robots")) |
218 | else if (!strcmp(name, "robots")) |
217 | ctx.cfg.robots = xstrdup(value); |
219 | ctx.cfg.robots = xstrdup(value); |
218 | else if (!strcmp(name, "clone-prefix")) |
220 | else if (!strcmp(name, "clone-prefix")) |
219 | ctx.cfg.clone_prefix = xstrdup(value); |
221 | ctx.cfg.clone_prefix = xstrdup(value); |
220 | else if (!strcmp(name, "local-time")) |
222 | else if (!strcmp(name, "local-time")) |
221 | ctx.cfg.local_time = atoi(value); |
223 | ctx.cfg.local_time = atoi(value); |
222 | else if (!prefixcmp(name, "mimetype.")) |
224 | else if (!prefixcmp(name, "mimetype.")) |
223 | add_mimetype(name + 9, value); |
225 | add_mimetype(name + 9, value); |
224 | else if (!strcmp(name, "include")) |
226 | else if (!strcmp(name, "include")) |
225 | parse_configfile(expand_macros(value), config_cb); |
227 | parse_configfile(expand_macros(value), config_cb); |
226 | } |
228 | } |
227 | |
229 | |
228 | static void querystring_cb(const char *name, const char *value) |
230 | static void querystring_cb(const char *name, const char *value) |
229 | { |
231 | { |
230 | if (!value) |
232 | if (!value) |
231 | value = ""; |
233 | value = ""; |
232 | |
234 | |
233 | if (!strcmp(name,"r")) { |
235 | if (!strcmp(name,"r")) { |
234 | ctx.qry.repo = xstrdup(value); |
236 | ctx.qry.repo = xstrdup(value); |
235 | ctx.repo = cgit_get_repoinfo(value); |
237 | ctx.repo = cgit_get_repoinfo(value); |
236 | } else if (!strcmp(name, "p")) { |
238 | } else if (!strcmp(name, "p")) { |
237 | ctx.qry.page = xstrdup(value); |
239 | ctx.qry.page = xstrdup(value); |
238 | } else if (!strcmp(name, "url")) { |
240 | } else if (!strcmp(name, "url")) { |
239 | if (*value == '/') |
241 | if (*value == '/') |
240 | value++; |
242 | value++; |
241 | ctx.qry.url = xstrdup(value); |
243 | ctx.qry.url = xstrdup(value); |
242 | cgit_parse_url(value); |
244 | cgit_parse_url(value); |
243 | } else if (!strcmp(name, "qt")) { |
245 | } else if (!strcmp(name, "qt")) { |
244 | ctx.qry.grep = xstrdup(value); |
246 | ctx.qry.grep = xstrdup(value); |
245 | } else if (!strcmp(name, "q")) { |
247 | } else if (!strcmp(name, "q")) { |
@@ -270,96 +272,97 @@ static void querystring_cb(const char *name, const char *value) |
270 | } else if (!strcmp(name, "ss")) { |
272 | } else if (!strcmp(name, "ss")) { |
271 | ctx.qry.ssdiff = atoi(value); |
273 | ctx.qry.ssdiff = atoi(value); |
272 | } else if (!strcmp(name, "all")) { |
274 | } else if (!strcmp(name, "all")) { |
273 | ctx.qry.show_all = atoi(value); |
275 | ctx.qry.show_all = atoi(value); |
274 | } else if (!strcmp(name, "context")) { |
276 | } else if (!strcmp(name, "context")) { |
275 | ctx.qry.context = atoi(value); |
277 | ctx.qry.context = atoi(value); |
276 | } else if (!strcmp(name, "ignorews")) { |
278 | } else if (!strcmp(name, "ignorews")) { |
277 | ctx.qry.ignorews = atoi(value); |
279 | ctx.qry.ignorews = atoi(value); |
278 | } |
280 | } |
279 | } |
281 | } |
280 | |
282 | |
281 | char *xstrdupn(const char *str) |
283 | char *xstrdupn(const char *str) |
282 | { |
284 | { |
283 | return (str ? xstrdup(str) : NULL); |
285 | return (str ? xstrdup(str) : NULL); |
284 | } |
286 | } |
285 | |
287 | |
286 | static void prepare_context(struct cgit_context *ctx) |
288 | static void prepare_context(struct cgit_context *ctx) |
287 | { |
289 | { |
288 | memset(ctx, 0, sizeof(*ctx)); |
290 | memset(ctx, 0, sizeof(*ctx)); |
289 | ctx->cfg.agefile = "info/web/last-modified"; |
291 | ctx->cfg.agefile = "info/web/last-modified"; |
290 | ctx->cfg.nocache = 0; |
292 | ctx->cfg.nocache = 0; |
291 | ctx->cfg.cache_size = 0; |
293 | ctx->cfg.cache_size = 0; |
292 | ctx->cfg.cache_dynamic_ttl = 5; |
294 | ctx->cfg.cache_dynamic_ttl = 5; |
293 | ctx->cfg.cache_max_create_time = 5; |
295 | ctx->cfg.cache_max_create_time = 5; |
294 | ctx->cfg.cache_repo_ttl = 5; |
296 | ctx->cfg.cache_repo_ttl = 5; |
295 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
297 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
296 | ctx->cfg.cache_root_ttl = 5; |
298 | ctx->cfg.cache_root_ttl = 5; |
297 | ctx->cfg.cache_scanrc_ttl = 15; |
299 | ctx->cfg.cache_scanrc_ttl = 15; |
298 | ctx->cfg.cache_static_ttl = -1; |
300 | ctx->cfg.cache_static_ttl = -1; |
299 | ctx->cfg.css = "/cgit.css"; |
301 | ctx->cfg.css = "/cgit.css"; |
300 | ctx->cfg.logo = "/cgit.png"; |
302 | ctx->cfg.logo = "/cgit.png"; |
301 | ctx->cfg.local_time = 0; |
303 | ctx->cfg.local_time = 0; |
302 | ctx->cfg.enable_gitweb_owner = 1; |
304 | ctx->cfg.enable_gitweb_owner = 1; |
303 | ctx->cfg.enable_tree_linenumbers = 1; |
305 | ctx->cfg.enable_tree_linenumbers = 1; |
304 | ctx->cfg.max_repo_count = 50; |
306 | ctx->cfg.max_repo_count = 50; |
305 | ctx->cfg.max_commit_count = 50; |
307 | ctx->cfg.max_commit_count = 50; |
306 | ctx->cfg.max_lock_attempts = 5; |
308 | ctx->cfg.max_lock_attempts = 5; |
307 | ctx->cfg.max_msg_len = 80; |
309 | ctx->cfg.max_msg_len = 80; |
308 | ctx->cfg.max_repodesc_len = 80; |
310 | ctx->cfg.max_repodesc_len = 80; |
309 | ctx->cfg.max_blob_size = 0; |
311 | ctx->cfg.max_blob_size = 0; |
310 | ctx->cfg.max_stats = 0; |
312 | ctx->cfg.max_stats = 0; |
311 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
313 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
312 | ctx->cfg.project_list = NULL; |
314 | ctx->cfg.project_list = NULL; |
313 | ctx->cfg.renamelimit = -1; |
315 | ctx->cfg.renamelimit = -1; |
314 | ctx->cfg.remove_suffix = 0; |
316 | ctx->cfg.remove_suffix = 0; |
315 | ctx->cfg.robots = "index, nofollow"; |
317 | ctx->cfg.robots = "index, nofollow"; |
316 | ctx->cfg.root_title = "Git repository browser"; |
318 | ctx->cfg.root_title = "Git repository browser"; |
317 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
319 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
| |
320 | ctx->cfg.scan_hidden_path = 0; |
318 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
321 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
319 | ctx->cfg.section = ""; |
322 | ctx->cfg.section = ""; |
320 | ctx->cfg.summary_branches = 10; |
323 | ctx->cfg.summary_branches = 10; |
321 | ctx->cfg.summary_log = 10; |
324 | ctx->cfg.summary_log = 10; |
322 | ctx->cfg.summary_tags = 10; |
325 | ctx->cfg.summary_tags = 10; |
323 | ctx->cfg.max_atom_items = 10; |
326 | ctx->cfg.max_atom_items = 10; |
324 | ctx->cfg.ssdiff = 0; |
327 | ctx->cfg.ssdiff = 0; |
325 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
328 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
326 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
329 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
327 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
330 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
328 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
331 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
329 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
332 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
330 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
333 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
331 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
334 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
332 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
335 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
333 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
336 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
334 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
337 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
335 | ctx->page.mimetype = "text/html"; |
338 | ctx->page.mimetype = "text/html"; |
336 | ctx->page.charset = PAGE_ENCODING; |
339 | ctx->page.charset = PAGE_ENCODING; |
337 | ctx->page.filename = NULL; |
340 | ctx->page.filename = NULL; |
338 | ctx->page.size = 0; |
341 | ctx->page.size = 0; |
339 | ctx->page.modified = time(NULL); |
342 | ctx->page.modified = time(NULL); |
340 | ctx->page.expires = ctx->page.modified; |
343 | ctx->page.expires = ctx->page.modified; |
341 | ctx->page.etag = NULL; |
344 | ctx->page.etag = NULL; |
342 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
345 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
343 | if (ctx->env.script_name) |
346 | if (ctx->env.script_name) |
344 | ctx->cfg.script_name = ctx->env.script_name; |
347 | ctx->cfg.script_name = ctx->env.script_name; |
345 | if (ctx->env.query_string) |
348 | if (ctx->env.query_string) |
346 | ctx->qry.raw = ctx->env.query_string; |
349 | ctx->qry.raw = ctx->env.query_string; |
347 | if (!ctx->env.cgit_config) |
350 | if (!ctx->env.cgit_config) |
348 | ctx->env.cgit_config = CGIT_CONFIG; |
351 | ctx->env.cgit_config = CGIT_CONFIG; |
349 | } |
352 | } |
350 | |
353 | |
351 | struct refmatch { |
354 | struct refmatch { |
352 | char *req_ref; |
355 | char *req_ref; |
353 | char *first_ref; |
356 | char *first_ref; |
354 | int match; |
357 | int match; |
355 | }; |
358 | }; |
356 | |
359 | |
357 | int find_current_ref(const char *refname, const unsigned char *sha1, |
360 | int find_current_ref(const char *refname, const unsigned char *sha1, |
358 | int flags, void *cb_data) |
361 | int flags, void *cb_data) |
359 | { |
362 | { |
360 | struct refmatch *info; |
363 | struct refmatch *info; |
361 | |
364 | |
362 | info = (struct refmatch *)cb_data; |
365 | info = (struct refmatch *)cb_data; |
363 | if (!strcmp(refname, info->req_ref)) |
366 | if (!strcmp(refname, info->req_ref)) |
364 | info->match = 1; |
367 | info->match = 1; |
365 | if (!info->first_ref) |
368 | if (!info->first_ref) |
|