|
diff --git a/cgit.c b/cgit.c index b0e202e..93a7a69 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -430,128 +430,131 @@ static void process_request(void *cbdata) |
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 | char *build_snapshot_setting(int bitmap) |
440 | char *build_snapshot_setting(int bitmap) |
441 | { |
441 | { |
442 | const struct cgit_snapshot_format *f; |
442 | const struct cgit_snapshot_format *f; |
443 | char *result = xstrdup(""); |
443 | char *result = xstrdup(""); |
444 | char *tmp; |
444 | char *tmp; |
445 | int len; |
445 | int len; |
446 | |
446 | |
447 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
447 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
448 | if (f->bit & bitmap) { |
448 | if (f->bit & bitmap) { |
449 | tmp = result; |
449 | tmp = result; |
450 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
450 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
451 | free(tmp); |
451 | free(tmp); |
452 | } |
452 | } |
453 | } |
453 | } |
454 | len = strlen(result); |
454 | len = strlen(result); |
455 | if (len) |
455 | if (len) |
456 | result[len - 1] = '\0'; |
456 | result[len - 1] = '\0'; |
457 | return result; |
457 | return result; |
458 | } |
458 | } |
459 | |
459 | |
460 | void print_repo(FILE *f, struct cgit_repo *repo) |
460 | void print_repo(FILE *f, struct cgit_repo *repo) |
461 | { |
461 | { |
462 | fprintf(f, "repo.url=%s\n", repo->url); |
462 | fprintf(f, "repo.url=%s\n", repo->url); |
463 | fprintf(f, "repo.name=%s\n", repo->name); |
463 | fprintf(f, "repo.name=%s\n", repo->name); |
464 | fprintf(f, "repo.path=%s\n", repo->path); |
464 | fprintf(f, "repo.path=%s\n", repo->path); |
465 | if (repo->owner) |
465 | if (repo->owner) |
466 | fprintf(f, "repo.owner=%s\n", repo->owner); |
466 | fprintf(f, "repo.owner=%s\n", repo->owner); |
467 | if (repo->desc) |
467 | if (repo->desc) |
468 | fprintf(f, "repo.desc=%s\n", repo->desc); |
468 | fprintf(f, "repo.desc=%s\n", repo->desc); |
469 | if (repo->readme) |
469 | if (repo->readme) |
470 | fprintf(f, "repo.readme=%s\n", repo->readme); |
470 | fprintf(f, "repo.readme=%s\n", repo->readme); |
471 | if (repo->defbranch) |
471 | if (repo->defbranch) |
472 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
472 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
473 | if (repo->module_link) |
473 | if (repo->module_link) |
474 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
474 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
475 | if (repo->section) |
475 | if (repo->section) |
476 | fprintf(f, "repo.section=%s\n", repo->section); |
476 | fprintf(f, "repo.section=%s\n", repo->section); |
477 | if (repo->clone_url) |
477 | if (repo->clone_url) |
478 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
478 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
479 | fprintf(f, "repo.enable-log-filecount=%d\n", |
479 | fprintf(f, "repo.enable-log-filecount=%d\n", |
480 | repo->enable_log_filecount); |
480 | repo->enable_log_filecount); |
481 | fprintf(f, "repo.enable-log-linecount=%d\n", |
481 | fprintf(f, "repo.enable-log-linecount=%d\n", |
482 | repo->enable_log_linecount); |
482 | repo->enable_log_linecount); |
483 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
483 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
484 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
484 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
485 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
485 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
486 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
486 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
487 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
487 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
488 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
488 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
489 | if (repo->snapshots != ctx.cfg.snapshots) { |
489 | if (repo->snapshots != ctx.cfg.snapshots) { |
490 | char *tmp = build_snapshot_setting(repo->snapshots); |
490 | char *tmp = build_snapshot_setting(repo->snapshots); |
491 | fprintf(f, "repo.snapshots=%s\n", tmp); |
491 | fprintf(f, "repo.snapshots=%s\n", tmp); |
492 | free(tmp); |
492 | free(tmp); |
493 | } |
493 | } |
| |
494 | if (repo->max_stats != ctx.cfg.max_stats) |
| |
495 | fprintf(f, "repo.max-stats=%s\n", |
| |
496 | cgit_find_stats_periodname(repo->max_stats)); |
494 | fprintf(f, "\n"); |
497 | fprintf(f, "\n"); |
495 | } |
498 | } |
496 | |
499 | |
497 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
500 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
498 | { |
501 | { |
499 | int i; |
502 | int i; |
500 | |
503 | |
501 | for(i = start; i < list->count; i++) |
504 | for(i = start; i < list->count; i++) |
502 | print_repo(f, &list->repos[i]); |
505 | print_repo(f, &list->repos[i]); |
503 | } |
506 | } |
504 | |
507 | |
505 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
508 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
506 | * and return 0 on success. |
509 | * and return 0 on success. |
507 | */ |
510 | */ |
508 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
511 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
509 | { |
512 | { |
510 | char *locked_rc; |
513 | char *locked_rc; |
511 | int idx; |
514 | int idx; |
512 | FILE *f; |
515 | FILE *f; |
513 | |
516 | |
514 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
517 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
515 | f = fopen(locked_rc, "wx"); |
518 | f = fopen(locked_rc, "wx"); |
516 | if (!f) { |
519 | if (!f) { |
517 | /* Inform about the error unless the lockfile already existed, |
520 | /* Inform about the error unless the lockfile already existed, |
518 | * since that only means we've got concurrent requests. |
521 | * since that only means we've got concurrent requests. |
519 | */ |
522 | */ |
520 | if (errno != EEXIST) |
523 | if (errno != EEXIST) |
521 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
524 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
522 | locked_rc, strerror(errno), errno); |
525 | locked_rc, strerror(errno), errno); |
523 | return errno; |
526 | return errno; |
524 | } |
527 | } |
525 | idx = cgit_repolist.count; |
528 | idx = cgit_repolist.count; |
526 | scan_tree(path, repo_config); |
529 | scan_tree(path, repo_config); |
527 | print_repolist(f, &cgit_repolist, idx); |
530 | print_repolist(f, &cgit_repolist, idx); |
528 | if (rename(locked_rc, cached_rc)) |
531 | if (rename(locked_rc, cached_rc)) |
529 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
532 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
530 | locked_rc, cached_rc, strerror(errno), errno); |
533 | locked_rc, cached_rc, strerror(errno), errno); |
531 | fclose(f); |
534 | fclose(f); |
532 | return 0; |
535 | return 0; |
533 | } |
536 | } |
534 | |
537 | |
535 | static void process_cached_repolist(const char *path) |
538 | static void process_cached_repolist(const char *path) |
536 | { |
539 | { |
537 | struct stat st; |
540 | struct stat st; |
538 | char *cached_rc; |
541 | char *cached_rc; |
539 | time_t age; |
542 | time_t age; |
540 | |
543 | |
541 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
544 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, |
542 | hash_str(path))); |
545 | hash_str(path))); |
543 | |
546 | |
544 | if (stat(cached_rc, &st)) { |
547 | if (stat(cached_rc, &st)) { |
545 | /* Nothing is cached, we need to scan without forking. And |
548 | /* Nothing is cached, we need to scan without forking. And |
546 | * if we fail to generate a cached repolist, we need to |
549 | * if we fail to generate a cached repolist, we need to |
547 | * invoke scan_tree manually. |
550 | * invoke scan_tree manually. |
548 | */ |
551 | */ |
549 | if (generate_cached_repolist(path, cached_rc)) |
552 | if (generate_cached_repolist(path, cached_rc)) |
550 | scan_tree(path, repo_config); |
553 | scan_tree(path, repo_config); |
551 | return; |
554 | return; |
552 | } |
555 | } |
553 | |
556 | |
554 | parse_configfile(cached_rc, config_cb); |
557 | parse_configfile(cached_rc, config_cb); |
555 | |
558 | |
556 | /* If the cached configfile hasn't expired, lets exit now */ |
559 | /* If the cached configfile hasn't expired, lets exit now */ |
557 | age = time(NULL) - st.st_mtime; |
560 | age = time(NULL) - st.st_mtime; |
|