summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 8ab6889..b0e202e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -416,77 +416,102 @@ static void process_request(void *cbdata)
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
434int cmp_repos(const void *a, const void *b) 434int 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
440char *build_snapshot_setting(int bitmap)
441{
442 const struct cgit_snapshot_format *f;
443 char *result = xstrdup("");
444 char *tmp;
445 int len;
446
447 for (f = cgit_snapshot_formats; f->suffix; f++) {
448 if (f->bit & bitmap) {
449 tmp = result;
450 result = xstrdup(fmt("%s%s ", tmp, f->suffix));
451 free(tmp);
452 }
453 }
454 len = strlen(result);
455 if (len)
456 result[len - 1] = '\0';
457 return result;
458}
459
440void print_repo(FILE *f, struct cgit_repo *repo) 460void print_repo(FILE *f, struct cgit_repo *repo)
441{ 461{
442 fprintf(f, "repo.url=%s\n", repo->url); 462 fprintf(f, "repo.url=%s\n", repo->url);
443 fprintf(f, "repo.name=%s\n", repo->name); 463 fprintf(f, "repo.name=%s\n", repo->name);
444 fprintf(f, "repo.path=%s\n", repo->path); 464 fprintf(f, "repo.path=%s\n", repo->path);
445 if (repo->owner) 465 if (repo->owner)
446 fprintf(f, "repo.owner=%s\n", repo->owner); 466 fprintf(f, "repo.owner=%s\n", repo->owner);
447 if (repo->desc) 467 if (repo->desc)
448 fprintf(f, "repo.desc=%s\n", repo->desc); 468 fprintf(f, "repo.desc=%s\n", repo->desc);
449 if (repo->readme) 469 if (repo->readme)
450 fprintf(f, "repo.readme=%s\n", repo->readme); 470 fprintf(f, "repo.readme=%s\n", repo->readme);
451 if (repo->defbranch) 471 if (repo->defbranch)
452 fprintf(f, "repo.defbranch=%s\n", repo->defbranch); 472 fprintf(f, "repo.defbranch=%s\n", repo->defbranch);
453 if (repo->module_link) 473 if (repo->module_link)
454 fprintf(f, "repo.module-link=%s\n", repo->module_link); 474 fprintf(f, "repo.module-link=%s\n", repo->module_link);
455 if (repo->section) 475 if (repo->section)
456 fprintf(f, "repo.section=%s\n", repo->section); 476 fprintf(f, "repo.section=%s\n", repo->section);
457 if (repo->clone_url) 477 if (repo->clone_url)
458 fprintf(f, "repo.clone-url=%s\n", repo->clone_url); 478 fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
459 fprintf(f, "repo.enable-log-filecount=%d\n", 479 fprintf(f, "repo.enable-log-filecount=%d\n",
460 repo->enable_log_filecount); 480 repo->enable_log_filecount);
461 fprintf(f, "repo.enable-log-linecount=%d\n", 481 fprintf(f, "repo.enable-log-linecount=%d\n",
462 repo->enable_log_linecount); 482 repo->enable_log_linecount);
463 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) 483 if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
464 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); 484 fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
465 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) 485 if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
466 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); 486 fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
467 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) 487 if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
468 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) {
490 char *tmp = build_snapshot_setting(repo->snapshots);
491 fprintf(f, "repo.snapshots=%s\n", tmp);
492 free(tmp);
493 }
469 fprintf(f, "\n"); 494 fprintf(f, "\n");
470} 495}
471 496
472void print_repolist(FILE *f, struct cgit_repolist *list, int start) 497void print_repolist(FILE *f, struct cgit_repolist *list, int start)
473{ 498{
474 int i; 499 int i;
475 500
476 for(i = start; i < list->count; i++) 501 for(i = start; i < list->count; i++)
477 print_repo(f, &list->repos[i]); 502 print_repo(f, &list->repos[i]);
478} 503}
479 504
480/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' 505/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc'
481 * and return 0 on success. 506 * and return 0 on success.
482 */ 507 */
483static int generate_cached_repolist(const char *path, const char *cached_rc) 508static int generate_cached_repolist(const char *path, const char *cached_rc)
484{ 509{
485 char *locked_rc; 510 char *locked_rc;
486 int idx; 511 int idx;
487 FILE *f; 512 FILE *f;
488 513
489 locked_rc = xstrdup(fmt("%s.lock", cached_rc)); 514 locked_rc = xstrdup(fmt("%s.lock", cached_rc));
490 f = fopen(locked_rc, "wx"); 515 f = fopen(locked_rc, "wx");
491 if (!f) { 516 if (!f) {
492 /* Inform about the error unless the lockfile already existed, 517 /* Inform about the error unless the lockfile already existed,