author | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:59 (UTC) |
commit | 3548320004512276ea0bbfe80b2ae9b5cc7e2c76 (patch) (unidiff) | |
tree | 779bd50d5ec3bf575b2ddebf89a27ea87f5730b2 /cgit.c | |
parent | 42e7a169e8b7212847404730b781131759abd877 (diff) | |
download | cgit-3548320004512276ea0bbfe80b2ae9b5cc7e2c76.zip cgit-3548320004512276ea0bbfe80b2ae9b5cc7e2c76.tar.gz cgit-3548320004512276ea0bbfe80b2ae9b5cc7e2c76.tar.bz2 |
cgit.c: add missing options to print_repo()
Note: print_repo() still ignores repo.max-stats and repo.snapshots,
which both requires additional work since these settings are represented
internally as an enum and a bitmap.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -419,64 +419,82 @@ static void process_request(void *cbdata) | |||
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; |