|
diff --git a/cgit.c b/cgit.c index f1ea03c..8ab6889 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -403,96 +403,114 @@ static void process_request(void *cbdata) |
403 | cgit_print_docstart(ctx); |
403 | cgit_print_docstart(ctx); |
404 | cgit_print_pageheader(ctx); |
404 | cgit_print_pageheader(ctx); |
405 | cgit_print_error("Invalid request"); |
405 | cgit_print_error("Invalid request"); |
406 | cgit_print_docend(); |
406 | cgit_print_docend(); |
407 | return; |
407 | return; |
408 | } |
408 | } |
409 | |
409 | |
410 | if (cmd->want_repo && !ctx->repo) { |
410 | if (cmd->want_repo && !ctx->repo) { |
411 | cgit_print_http_headers(ctx); |
411 | cgit_print_http_headers(ctx); |
412 | cgit_print_docstart(ctx); |
412 | cgit_print_docstart(ctx); |
413 | cgit_print_pageheader(ctx); |
413 | cgit_print_pageheader(ctx); |
414 | cgit_print_error(fmt("No repository selected")); |
414 | cgit_print_error(fmt("No repository selected")); |
415 | cgit_print_docend(); |
415 | cgit_print_docend(); |
416 | return; |
416 | return; |
417 | } |
417 | } |
418 | |
418 | |
419 | if (ctx->repo && prepare_repo_cmd(ctx)) |
419 | if (ctx->repo && prepare_repo_cmd(ctx)) |
420 | return; |
420 | return; |
421 | |
421 | |
422 | if (cmd->want_layout) { |
422 | if (cmd->want_layout) { |
423 | cgit_print_http_headers(ctx); |
423 | cgit_print_http_headers(ctx); |
424 | cgit_print_docstart(ctx); |
424 | cgit_print_docstart(ctx); |
425 | cgit_print_pageheader(ctx); |
425 | cgit_print_pageheader(ctx); |
426 | } |
426 | } |
427 | |
427 | |
428 | cmd->fn(ctx); |
428 | cmd->fn(ctx); |
429 | |
429 | |
430 | if (cmd->want_layout) |
430 | if (cmd->want_layout) |
431 | cgit_print_docend(); |
431 | cgit_print_docend(); |
432 | } |
432 | } |
433 | |
433 | |
434 | int cmp_repos(const void *a, const void *b) |
434 | int cmp_repos(const void *a, const void *b) |
435 | { |
435 | { |
436 | const struct cgit_repo *ra = a, *rb = b; |
436 | const struct cgit_repo *ra = a, *rb = b; |
437 | return strcmp(ra->url, rb->url); |
437 | return strcmp(ra->url, rb->url); |
438 | } |
438 | } |
439 | |
439 | |
440 | void print_repo(FILE *f, struct cgit_repo *repo) |
440 | void print_repo(FILE *f, struct cgit_repo *repo) |
441 | { |
441 | { |
442 | fprintf(f, "repo.url=%s\n", repo->url); |
442 | fprintf(f, "repo.url=%s\n", repo->url); |
443 | fprintf(f, "repo.name=%s\n", repo->name); |
443 | fprintf(f, "repo.name=%s\n", repo->name); |
444 | fprintf(f, "repo.path=%s\n", repo->path); |
444 | fprintf(f, "repo.path=%s\n", repo->path); |
445 | if (repo->owner) |
445 | if (repo->owner) |
446 | fprintf(f, "repo.owner=%s\n", repo->owner); |
446 | fprintf(f, "repo.owner=%s\n", repo->owner); |
447 | if (repo->desc) |
447 | if (repo->desc) |
448 | fprintf(f, "repo.desc=%s\n", repo->desc); |
448 | fprintf(f, "repo.desc=%s\n", repo->desc); |
449 | if (repo->readme) |
449 | if (repo->readme) |
450 | fprintf(f, "repo.readme=%s\n", repo->readme); |
450 | fprintf(f, "repo.readme=%s\n", repo->readme); |
| |
451 | if (repo->defbranch) |
| |
452 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
| |
453 | if (repo->module_link) |
| |
454 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
| |
455 | if (repo->section) |
| |
456 | fprintf(f, "repo.section=%s\n", repo->section); |
| |
457 | if (repo->clone_url) |
| |
458 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
| |
459 | fprintf(f, "repo.enable-log-filecount=%d\n", |
| |
460 | repo->enable_log_filecount); |
| |
461 | fprintf(f, "repo.enable-log-linecount=%d\n", |
| |
462 | repo->enable_log_linecount); |
| |
463 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
| |
464 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
| |
465 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
| |
466 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
| |
467 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
| |
468 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
451 | fprintf(f, "\n"); |
469 | fprintf(f, "\n"); |
452 | } |
470 | } |
453 | |
471 | |
454 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
472 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
455 | { |
473 | { |
456 | int i; |
474 | int i; |
457 | |
475 | |
458 | for(i = start; i < list->count; i++) |
476 | for(i = start; i < list->count; i++) |
459 | print_repo(f, &list->repos[i]); |
477 | print_repo(f, &list->repos[i]); |
460 | } |
478 | } |
461 | |
479 | |
462 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
480 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
463 | * and return 0 on success. |
481 | * and return 0 on success. |
464 | */ |
482 | */ |
465 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
483 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
466 | { |
484 | { |
467 | char *locked_rc; |
485 | char *locked_rc; |
468 | int idx; |
486 | int idx; |
469 | FILE *f; |
487 | FILE *f; |
470 | |
488 | |
471 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
489 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
472 | f = fopen(locked_rc, "wx"); |
490 | f = fopen(locked_rc, "wx"); |
473 | if (!f) { |
491 | if (!f) { |
474 | /* Inform about the error unless the lockfile already existed, |
492 | /* Inform about the error unless the lockfile already existed, |
475 | * since that only means we've got concurrent requests. |
493 | * since that only means we've got concurrent requests. |
476 | */ |
494 | */ |
477 | if (errno != EEXIST) |
495 | if (errno != EEXIST) |
478 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
496 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
479 | locked_rc, strerror(errno), errno); |
497 | locked_rc, strerror(errno), errno); |
480 | return errno; |
498 | return errno; |
481 | } |
499 | } |
482 | idx = cgit_repolist.count; |
500 | idx = cgit_repolist.count; |
483 | scan_tree(path, repo_config); |
501 | scan_tree(path, repo_config); |
484 | print_repolist(f, &cgit_repolist, idx); |
502 | print_repolist(f, &cgit_repolist, idx); |
485 | if (rename(locked_rc, cached_rc)) |
503 | if (rename(locked_rc, cached_rc)) |
486 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
504 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
487 | locked_rc, cached_rc, strerror(errno), errno); |
505 | locked_rc, cached_rc, strerror(errno), errno); |
488 | fclose(f); |
506 | fclose(f); |
489 | return 0; |
507 | return 0; |
490 | } |
508 | } |
491 | |
509 | |
492 | static void process_cached_repolist(const char *path) |
510 | static void process_cached_repolist(const char *path) |
493 | { |
511 | { |
494 | struct stat st; |
512 | struct stat st; |
495 | char *cached_rc; |
513 | char *cached_rc; |
496 | time_t age; |
514 | time_t age; |
497 | |
515 | |
498 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
516 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
|