|
diff --git a/cgit.c b/cgit.c index bbde64b..d37abc9 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -262,97 +262,106 @@ static int prepare_repo_cmd(struct cgit_context *ctx) |
262 | cgit_print_docend(); |
262 | cgit_print_docend(); |
263 | return 1; |
263 | return 1; |
264 | } |
264 | } |
265 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
265 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
266 | |
266 | |
267 | if (!ctx->qry.head) { |
267 | if (!ctx->qry.head) { |
268 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
268 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
269 | ctx->repo->defbranch = ctx->qry.head; |
269 | ctx->repo->defbranch = ctx->qry.head; |
270 | } |
270 | } |
271 | |
271 | |
272 | if (!ctx->qry.head) { |
272 | if (!ctx->qry.head) { |
273 | cgit_print_http_headers(ctx); |
273 | cgit_print_http_headers(ctx); |
274 | cgit_print_docstart(ctx); |
274 | cgit_print_docstart(ctx); |
275 | cgit_print_pageheader(ctx); |
275 | cgit_print_pageheader(ctx); |
276 | cgit_print_error("Repository seems to be empty"); |
276 | cgit_print_error("Repository seems to be empty"); |
277 | cgit_print_docend(); |
277 | cgit_print_docend(); |
278 | return 1; |
278 | return 1; |
279 | } |
279 | } |
280 | |
280 | |
281 | if (get_sha1(ctx->qry.head, sha1)) { |
281 | if (get_sha1(ctx->qry.head, sha1)) { |
282 | tmp = xstrdup(ctx->qry.head); |
282 | tmp = xstrdup(ctx->qry.head); |
283 | ctx->qry.head = ctx->repo->defbranch; |
283 | ctx->qry.head = ctx->repo->defbranch; |
284 | cgit_print_http_headers(ctx); |
284 | cgit_print_http_headers(ctx); |
285 | cgit_print_docstart(ctx); |
285 | cgit_print_docstart(ctx); |
286 | cgit_print_pageheader(ctx); |
286 | cgit_print_pageheader(ctx); |
287 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
287 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
288 | cgit_print_docend(); |
288 | cgit_print_docend(); |
289 | return 1; |
289 | return 1; |
290 | } |
290 | } |
291 | return 0; |
291 | return 0; |
292 | } |
292 | } |
293 | |
293 | |
294 | static void process_request(struct cgit_context *ctx) |
294 | static void process_request(struct cgit_context *ctx) |
295 | { |
295 | { |
296 | struct cgit_cmd *cmd; |
296 | struct cgit_cmd *cmd; |
297 | |
297 | |
298 | cmd = cgit_get_cmd(ctx); |
298 | cmd = cgit_get_cmd(ctx); |
299 | if (!cmd) { |
299 | if (!cmd) { |
300 | ctx->page.title = "cgit error"; |
300 | ctx->page.title = "cgit error"; |
301 | ctx->repo = NULL; |
301 | ctx->repo = NULL; |
302 | cgit_print_http_headers(ctx); |
302 | cgit_print_http_headers(ctx); |
303 | cgit_print_docstart(ctx); |
303 | cgit_print_docstart(ctx); |
304 | cgit_print_pageheader(ctx); |
304 | cgit_print_pageheader(ctx); |
305 | cgit_print_error("Invalid request"); |
305 | cgit_print_error("Invalid request"); |
306 | cgit_print_docend(); |
306 | cgit_print_docend(); |
307 | return; |
307 | return; |
308 | } |
308 | } |
309 | |
309 | |
310 | if (cmd->want_repo && prepare_repo_cmd(ctx)) |
310 | if (cmd->want_repo && !ctx->repo) { |
| |
311 | cgit_print_http_headers(ctx); |
| |
312 | cgit_print_docstart(ctx); |
| |
313 | cgit_print_pageheader(ctx); |
| |
314 | cgit_print_error(fmt("No repository selected")); |
| |
315 | cgit_print_docend(); |
| |
316 | return; |
| |
317 | } |
| |
318 | |
| |
319 | if (ctx->repo && prepare_repo_cmd(ctx)) |
311 | return; |
320 | return; |
312 | |
321 | |
313 | if (cmd->want_layout) { |
322 | if (cmd->want_layout) { |
314 | cgit_print_http_headers(ctx); |
323 | cgit_print_http_headers(ctx); |
315 | cgit_print_docstart(ctx); |
324 | cgit_print_docstart(ctx); |
316 | cgit_print_pageheader(ctx); |
325 | cgit_print_pageheader(ctx); |
317 | } |
326 | } |
318 | |
327 | |
319 | cmd->fn(ctx); |
328 | cmd->fn(ctx); |
320 | |
329 | |
321 | if (cmd->want_layout) |
330 | if (cmd->want_layout) |
322 | cgit_print_docend(); |
331 | cgit_print_docend(); |
323 | } |
332 | } |
324 | |
333 | |
325 | static long ttl_seconds(long ttl) |
334 | static long ttl_seconds(long ttl) |
326 | { |
335 | { |
327 | if (ttl<0) |
336 | if (ttl<0) |
328 | return 60 * 60 * 24 * 365; |
337 | return 60 * 60 * 24 * 365; |
329 | else |
338 | else |
330 | return ttl * 60; |
339 | return ttl * 60; |
331 | } |
340 | } |
332 | |
341 | |
333 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
342 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
334 | { |
343 | { |
335 | int stdout2; |
344 | int stdout2; |
336 | |
345 | |
337 | if (use_cache) { |
346 | if (use_cache) { |
338 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
347 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
339 | "Preserving STDOUT"); |
348 | "Preserving STDOUT"); |
340 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
349 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
341 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
350 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
342 | } |
351 | } |
343 | |
352 | |
344 | ctx.page.modified = time(NULL); |
353 | ctx.page.modified = time(NULL); |
345 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); |
354 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); |
346 | process_request(&ctx); |
355 | process_request(&ctx); |
347 | |
356 | |
348 | if (use_cache) { |
357 | if (use_cache) { |
349 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
358 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
350 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
359 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
351 | "Restoring original STDOUT"); |
360 | "Restoring original STDOUT"); |
352 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
361 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
353 | } |
362 | } |
354 | } |
363 | } |
355 | |
364 | |
356 | static void cgit_check_cache(struct cacheitem *item) |
365 | static void cgit_check_cache(struct cacheitem *item) |
357 | { |
366 | { |
358 | int i = 0; |
367 | int i = 0; |
|