|
diff --git a/cgit.c b/cgit.c index fde0757..c263872 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -167,192 +167,194 @@ void config_cb(const char *name, const char *value) |
167 | ctx.cfg.about_filter = new_filter(value, 0); |
167 | ctx.cfg.about_filter = new_filter(value, 0); |
168 | else if (!strcmp(name, "commit-filter")) |
168 | else if (!strcmp(name, "commit-filter")) |
169 | ctx.cfg.commit_filter = new_filter(value, 0); |
169 | ctx.cfg.commit_filter = new_filter(value, 0); |
170 | else if (!strcmp(name, "embedded")) |
170 | else if (!strcmp(name, "embedded")) |
171 | ctx.cfg.embedded = atoi(value); |
171 | ctx.cfg.embedded = atoi(value); |
172 | else if (!strcmp(name, "max-atom-items")) |
172 | else if (!strcmp(name, "max-atom-items")) |
173 | ctx.cfg.max_atom_items = atoi(value); |
173 | ctx.cfg.max_atom_items = atoi(value); |
174 | else if (!strcmp(name, "max-message-length")) |
174 | else if (!strcmp(name, "max-message-length")) |
175 | ctx.cfg.max_msg_len = atoi(value); |
175 | ctx.cfg.max_msg_len = atoi(value); |
176 | else if (!strcmp(name, "max-repodesc-length")) |
176 | else if (!strcmp(name, "max-repodesc-length")) |
177 | ctx.cfg.max_repodesc_len = atoi(value); |
177 | ctx.cfg.max_repodesc_len = atoi(value); |
178 | else if (!strcmp(name, "max-blob-size")) |
178 | else if (!strcmp(name, "max-blob-size")) |
179 | ctx.cfg.max_blob_size = atoi(value); |
179 | ctx.cfg.max_blob_size = atoi(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(expand_macros(value)); |
186 | process_cached_repolist(expand_macros(value)); |
187 | else |
187 | else |
188 | scan_tree(expand_macros(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); |
195 | else if (!strcmp(name, "summary-tags")) |
195 | else if (!strcmp(name, "summary-tags")) |
196 | ctx.cfg.summary_tags = atoi(value); |
196 | ctx.cfg.summary_tags = atoi(value); |
197 | else if (!strcmp(name, "side-by-side-diffs")) |
197 | else if (!strcmp(name, "side-by-side-diffs")) |
198 | ctx.cfg.ssdiff = atoi(value); |
198 | ctx.cfg.ssdiff = atoi(value); |
199 | else if (!strcmp(name, "agefile")) |
199 | else if (!strcmp(name, "agefile")) |
200 | ctx.cfg.agefile = xstrdup(value); |
200 | ctx.cfg.agefile = xstrdup(value); |
201 | else if (!strcmp(name, "renamelimit")) |
201 | else if (!strcmp(name, "renamelimit")) |
202 | ctx.cfg.renamelimit = atoi(value); |
202 | ctx.cfg.renamelimit = atoi(value); |
203 | else if (!strcmp(name, "robots")) |
203 | else if (!strcmp(name, "robots")) |
204 | ctx.cfg.robots = xstrdup(value); |
204 | ctx.cfg.robots = xstrdup(value); |
205 | else if (!strcmp(name, "clone-prefix")) |
205 | else if (!strcmp(name, "clone-prefix")) |
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(expand_macros(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 = ""; |
219 | |
219 | |
220 | if (!strcmp(name,"r")) { |
220 | if (!strcmp(name,"r")) { |
221 | ctx.qry.repo = xstrdup(value); |
221 | ctx.qry.repo = xstrdup(value); |
222 | ctx.repo = cgit_get_repoinfo(value); |
222 | ctx.repo = cgit_get_repoinfo(value); |
223 | } else if (!strcmp(name, "p")) { |
223 | } else if (!strcmp(name, "p")) { |
224 | ctx.qry.page = xstrdup(value); |
224 | ctx.qry.page = xstrdup(value); |
225 | } else if (!strcmp(name, "url")) { |
225 | } else if (!strcmp(name, "url")) { |
226 | if (*value == '/') |
226 | if (*value == '/') |
227 | value++; |
227 | value++; |
228 | ctx.qry.url = xstrdup(value); |
228 | ctx.qry.url = xstrdup(value); |
229 | cgit_parse_url(value); |
229 | cgit_parse_url(value); |
230 | } else if (!strcmp(name, "qt")) { |
230 | } else if (!strcmp(name, "qt")) { |
231 | ctx.qry.grep = xstrdup(value); |
231 | ctx.qry.grep = xstrdup(value); |
232 | } else if (!strcmp(name, "q")) { |
232 | } else if (!strcmp(name, "q")) { |
233 | ctx.qry.search = xstrdup(value); |
233 | ctx.qry.search = xstrdup(value); |
234 | } else if (!strcmp(name, "h")) { |
234 | } else if (!strcmp(name, "h")) { |
235 | ctx.qry.head = xstrdup(value); |
235 | ctx.qry.head = xstrdup(value); |
236 | ctx.qry.has_symref = 1; |
236 | ctx.qry.has_symref = 1; |
237 | } else if (!strcmp(name, "id")) { |
237 | } else if (!strcmp(name, "id")) { |
238 | ctx.qry.sha1 = xstrdup(value); |
238 | ctx.qry.sha1 = xstrdup(value); |
239 | ctx.qry.has_sha1 = 1; |
239 | ctx.qry.has_sha1 = 1; |
240 | } else if (!strcmp(name, "id2")) { |
240 | } else if (!strcmp(name, "id2")) { |
241 | ctx.qry.sha2 = xstrdup(value); |
241 | ctx.qry.sha2 = xstrdup(value); |
242 | ctx.qry.has_sha1 = 1; |
242 | ctx.qry.has_sha1 = 1; |
243 | } else if (!strcmp(name, "ofs")) { |
243 | } else if (!strcmp(name, "ofs")) { |
244 | ctx.qry.ofs = atoi(value); |
244 | ctx.qry.ofs = atoi(value); |
245 | } else if (!strcmp(name, "path")) { |
245 | } else if (!strcmp(name, "path")) { |
246 | ctx.qry.path = trim_end(value, '/'); |
246 | ctx.qry.path = trim_end(value, '/'); |
247 | } else if (!strcmp(name, "name")) { |
247 | } else if (!strcmp(name, "name")) { |
248 | ctx.qry.name = xstrdup(value); |
248 | ctx.qry.name = xstrdup(value); |
249 | } else if (!strcmp(name, "mimetype")) { |
249 | } else if (!strcmp(name, "mimetype")) { |
250 | ctx.qry.mimetype = xstrdup(value); |
250 | ctx.qry.mimetype = xstrdup(value); |
251 | } else if (!strcmp(name, "s")){ |
251 | } else if (!strcmp(name, "s")){ |
252 | ctx.qry.sort = xstrdup(value); |
252 | ctx.qry.sort = xstrdup(value); |
253 | } else if (!strcmp(name, "showmsg")) { |
253 | } else if (!strcmp(name, "showmsg")) { |
254 | ctx.qry.showmsg = atoi(value); |
254 | ctx.qry.showmsg = atoi(value); |
255 | } else if (!strcmp(name, "period")) { |
255 | } else if (!strcmp(name, "period")) { |
256 | ctx.qry.period = xstrdup(value); |
256 | ctx.qry.period = xstrdup(value); |
257 | } else if (!strcmp(name, "ss")) { |
257 | } else if (!strcmp(name, "ss")) { |
258 | ctx.qry.ssdiff = atoi(value); |
258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { |
259 | } else if (!strcmp(name, "all")) { |
260 | ctx.qry.show_all = atoi(value); |
260 | ctx.qry.show_all = atoi(value); |
261 | } else if (!strcmp(name, "context")) { |
261 | } else if (!strcmp(name, "context")) { |
262 | ctx.qry.context = atoi(value); |
262 | ctx.qry.context = atoi(value); |
| |
263 | } else if (!strcmp(name, "ignorews")) { |
| |
264 | ctx.qry.ignorews = atoi(value); |
263 | } |
265 | } |
264 | } |
266 | } |
265 | |
267 | |
266 | char *xstrdupn(const char *str) |
268 | char *xstrdupn(const char *str) |
267 | { |
269 | { |
268 | return (str ? xstrdup(str) : NULL); |
270 | return (str ? xstrdup(str) : NULL); |
269 | } |
271 | } |
270 | |
272 | |
271 | static void prepare_context(struct cgit_context *ctx) |
273 | static void prepare_context(struct cgit_context *ctx) |
272 | { |
274 | { |
273 | memset(ctx, 0, sizeof(*ctx)); |
275 | memset(ctx, 0, sizeof(*ctx)); |
274 | ctx->cfg.agefile = "info/web/last-modified"; |
276 | ctx->cfg.agefile = "info/web/last-modified"; |
275 | ctx->cfg.nocache = 0; |
277 | ctx->cfg.nocache = 0; |
276 | ctx->cfg.cache_size = 0; |
278 | ctx->cfg.cache_size = 0; |
277 | ctx->cfg.cache_dynamic_ttl = 5; |
279 | ctx->cfg.cache_dynamic_ttl = 5; |
278 | ctx->cfg.cache_max_create_time = 5; |
280 | ctx->cfg.cache_max_create_time = 5; |
279 | ctx->cfg.cache_repo_ttl = 5; |
281 | ctx->cfg.cache_repo_ttl = 5; |
280 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
282 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
281 | ctx->cfg.cache_root_ttl = 5; |
283 | ctx->cfg.cache_root_ttl = 5; |
282 | ctx->cfg.cache_scanrc_ttl = 15; |
284 | ctx->cfg.cache_scanrc_ttl = 15; |
283 | ctx->cfg.cache_static_ttl = -1; |
285 | ctx->cfg.cache_static_ttl = -1; |
284 | ctx->cfg.css = "/cgit.css"; |
286 | ctx->cfg.css = "/cgit.css"; |
285 | ctx->cfg.logo = "/cgit.png"; |
287 | ctx->cfg.logo = "/cgit.png"; |
286 | ctx->cfg.local_time = 0; |
288 | ctx->cfg.local_time = 0; |
287 | ctx->cfg.enable_tree_linenumbers = 1; |
289 | ctx->cfg.enable_tree_linenumbers = 1; |
288 | ctx->cfg.max_repo_count = 50; |
290 | ctx->cfg.max_repo_count = 50; |
289 | ctx->cfg.max_commit_count = 50; |
291 | ctx->cfg.max_commit_count = 50; |
290 | ctx->cfg.max_lock_attempts = 5; |
292 | ctx->cfg.max_lock_attempts = 5; |
291 | ctx->cfg.max_msg_len = 80; |
293 | ctx->cfg.max_msg_len = 80; |
292 | ctx->cfg.max_repodesc_len = 80; |
294 | ctx->cfg.max_repodesc_len = 80; |
293 | ctx->cfg.max_blob_size = 0; |
295 | ctx->cfg.max_blob_size = 0; |
294 | ctx->cfg.max_stats = 0; |
296 | ctx->cfg.max_stats = 0; |
295 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
297 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
296 | ctx->cfg.renamelimit = -1; |
298 | ctx->cfg.renamelimit = -1; |
297 | ctx->cfg.robots = "index, nofollow"; |
299 | ctx->cfg.robots = "index, nofollow"; |
298 | ctx->cfg.root_title = "Git repository browser"; |
300 | ctx->cfg.root_title = "Git repository browser"; |
299 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
301 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
300 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
302 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
301 | ctx->cfg.section = ""; |
303 | ctx->cfg.section = ""; |
302 | ctx->cfg.summary_branches = 10; |
304 | ctx->cfg.summary_branches = 10; |
303 | ctx->cfg.summary_log = 10; |
305 | ctx->cfg.summary_log = 10; |
304 | ctx->cfg.summary_tags = 10; |
306 | ctx->cfg.summary_tags = 10; |
305 | ctx->cfg.max_atom_items = 10; |
307 | ctx->cfg.max_atom_items = 10; |
306 | ctx->cfg.ssdiff = 0; |
308 | ctx->cfg.ssdiff = 0; |
307 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
309 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
308 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
310 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
309 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
311 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
310 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
312 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
311 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
313 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
312 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
314 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
313 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
315 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
314 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
316 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
315 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
317 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
316 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
318 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
317 | ctx->page.mimetype = "text/html"; |
319 | ctx->page.mimetype = "text/html"; |
318 | ctx->page.charset = PAGE_ENCODING; |
320 | ctx->page.charset = PAGE_ENCODING; |
319 | ctx->page.filename = NULL; |
321 | ctx->page.filename = NULL; |
320 | ctx->page.size = 0; |
322 | ctx->page.size = 0; |
321 | ctx->page.modified = time(NULL); |
323 | ctx->page.modified = time(NULL); |
322 | ctx->page.expires = ctx->page.modified; |
324 | ctx->page.expires = ctx->page.modified; |
323 | ctx->page.etag = NULL; |
325 | ctx->page.etag = NULL; |
324 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
326 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
325 | if (ctx->env.script_name) |
327 | if (ctx->env.script_name) |
326 | ctx->cfg.script_name = ctx->env.script_name; |
328 | ctx->cfg.script_name = ctx->env.script_name; |
327 | if (ctx->env.query_string) |
329 | if (ctx->env.query_string) |
328 | ctx->qry.raw = ctx->env.query_string; |
330 | ctx->qry.raw = ctx->env.query_string; |
329 | if (!ctx->env.cgit_config) |
331 | if (!ctx->env.cgit_config) |
330 | ctx->env.cgit_config = CGIT_CONFIG; |
332 | ctx->env.cgit_config = CGIT_CONFIG; |
331 | } |
333 | } |
332 | |
334 | |
333 | struct refmatch { |
335 | struct refmatch { |
334 | char *req_ref; |
336 | char *req_ref; |
335 | char *first_ref; |
337 | char *first_ref; |
336 | int match; |
338 | int match; |
337 | }; |
339 | }; |
338 | |
340 | |
339 | int find_current_ref(const char *refname, const unsigned char *sha1, |
341 | int find_current_ref(const char *refname, const unsigned char *sha1, |
340 | int flags, void *cb_data) |
342 | int flags, void *cb_data) |
341 | { |
343 | { |
342 | struct refmatch *info; |
344 | struct refmatch *info; |
343 | |
345 | |
344 | info = (struct refmatch *)cb_data; |
346 | info = (struct refmatch *)cb_data; |
345 | if (!strcmp(refname, info->req_ref)) |
347 | if (!strcmp(refname, info->req_ref)) |
346 | info->match = 1; |
348 | info->match = 1; |
347 | if (!info->first_ref) |
349 | if (!info->first_ref) |
348 | info->first_ref = xstrdup(refname); |
350 | info->first_ref = xstrdup(refname); |
349 | return info->match; |
351 | return info->match; |
350 | } |
352 | } |
351 | |
353 | |
352 | char *find_default_branch(struct cgit_repo *repo) |
354 | char *find_default_branch(struct cgit_repo *repo) |
353 | { |
355 | { |
354 | struct refmatch info; |
356 | struct refmatch info; |
355 | char *ref; |
357 | char *ref; |
356 | |
358 | |
357 | info.req_ref = repo->defbranch; |
359 | info.req_ref = repo->defbranch; |
358 | info.first_ref = NULL; |
360 | info.first_ref = NULL; |
|