|
diff --git a/cgit.c b/cgit.c index 916feb4..f4dd6ef 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -659,133 +659,134 @@ static void process_cached_repolist(const char *path) |
659 | exit(generate_cached_repolist(path, cached_rc)); |
659 | exit(generate_cached_repolist(path, cached_rc)); |
660 | } |
660 | } |
661 | |
661 | |
662 | static void cgit_parse_args(int argc, const char **argv) |
662 | static void cgit_parse_args(int argc, const char **argv) |
663 | { |
663 | { |
664 | int i; |
664 | int i; |
665 | int scan = 0; |
665 | int scan = 0; |
666 | |
666 | |
667 | for (i = 1; i < argc; i++) { |
667 | for (i = 1; i < argc; i++) { |
668 | if (!strncmp(argv[i], "--cache=", 8)) { |
668 | if (!strncmp(argv[i], "--cache=", 8)) { |
669 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
669 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
670 | } |
670 | } |
671 | if (!strcmp(argv[i], "--nocache")) { |
671 | if (!strcmp(argv[i], "--nocache")) { |
672 | ctx.cfg.nocache = 1; |
672 | ctx.cfg.nocache = 1; |
673 | } |
673 | } |
674 | if (!strcmp(argv[i], "--nohttp")) { |
674 | if (!strcmp(argv[i], "--nohttp")) { |
675 | ctx.env.no_http = "1"; |
675 | ctx.env.no_http = "1"; |
676 | } |
676 | } |
677 | if (!strncmp(argv[i], "--query=", 8)) { |
677 | if (!strncmp(argv[i], "--query=", 8)) { |
678 | ctx.qry.raw = xstrdup(argv[i]+8); |
678 | ctx.qry.raw = xstrdup(argv[i]+8); |
679 | } |
679 | } |
680 | if (!strncmp(argv[i], "--repo=", 7)) { |
680 | if (!strncmp(argv[i], "--repo=", 7)) { |
681 | ctx.qry.repo = xstrdup(argv[i]+7); |
681 | ctx.qry.repo = xstrdup(argv[i]+7); |
682 | } |
682 | } |
683 | if (!strncmp(argv[i], "--page=", 7)) { |
683 | if (!strncmp(argv[i], "--page=", 7)) { |
684 | ctx.qry.page = xstrdup(argv[i]+7); |
684 | ctx.qry.page = xstrdup(argv[i]+7); |
685 | } |
685 | } |
686 | if (!strncmp(argv[i], "--head=", 7)) { |
686 | if (!strncmp(argv[i], "--head=", 7)) { |
687 | ctx.qry.head = xstrdup(argv[i]+7); |
687 | ctx.qry.head = xstrdup(argv[i]+7); |
688 | ctx.qry.has_symref = 1; |
688 | ctx.qry.has_symref = 1; |
689 | } |
689 | } |
690 | if (!strncmp(argv[i], "--sha1=", 7)) { |
690 | if (!strncmp(argv[i], "--sha1=", 7)) { |
691 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
691 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
692 | ctx.qry.has_sha1 = 1; |
692 | ctx.qry.has_sha1 = 1; |
693 | } |
693 | } |
694 | if (!strncmp(argv[i], "--ofs=", 6)) { |
694 | if (!strncmp(argv[i], "--ofs=", 6)) { |
695 | ctx.qry.ofs = atoi(argv[i]+6); |
695 | ctx.qry.ofs = atoi(argv[i]+6); |
696 | } |
696 | } |
697 | if (!strncmp(argv[i], "--scan-tree=", 12) || |
697 | if (!strncmp(argv[i], "--scan-tree=", 12) || |
698 | !strncmp(argv[i], "--scan-path=", 12)) { |
698 | !strncmp(argv[i], "--scan-path=", 12)) { |
699 | /* HACK: the global snapshot bitmask defines the |
699 | /* HACK: the global snapshot bitmask defines the |
700 | * set of allowed snapshot formats, but the config |
700 | * set of allowed snapshot formats, but the config |
701 | * file hasn't been parsed yet so the mask is |
701 | * file hasn't been parsed yet so the mask is |
702 | * currently 0. By setting all bits high before |
702 | * currently 0. By setting all bits high before |
703 | * scanning we make sure that any in-repo cgitrc |
703 | * scanning we make sure that any in-repo cgitrc |
704 | * snapshot setting is respected by scan_tree(). |
704 | * snapshot setting is respected by scan_tree(). |
705 | * BTW: we assume that there'll never be more than |
705 | * BTW: we assume that there'll never be more than |
706 | * 255 different snapshot formats supported by cgit... |
706 | * 255 different snapshot formats supported by cgit... |
707 | */ |
707 | */ |
708 | ctx.cfg.snapshots = 0xFF; |
708 | ctx.cfg.snapshots = 0xFF; |
709 | scan++; |
709 | scan++; |
710 | scan_tree(argv[i] + 12, repo_config); |
710 | scan_tree(argv[i] + 12, repo_config); |
711 | } |
711 | } |
712 | } |
712 | } |
713 | if (scan) { |
713 | if (scan) { |
714 | qsort(cgit_repolist.repos, cgit_repolist.count, |
714 | qsort(cgit_repolist.repos, cgit_repolist.count, |
715 | sizeof(struct cgit_repo), cmp_repos); |
715 | sizeof(struct cgit_repo), cmp_repos); |
716 | print_repolist(stdout, &cgit_repolist, 0); |
716 | print_repolist(stdout, &cgit_repolist, 0); |
717 | exit(0); |
717 | exit(0); |
718 | } |
718 | } |
719 | } |
719 | } |
720 | |
720 | |
721 | static int calc_ttl() |
721 | static int calc_ttl() |
722 | { |
722 | { |
723 | if (!ctx.repo) |
723 | if (!ctx.repo) |
724 | return ctx.cfg.cache_root_ttl; |
724 | return ctx.cfg.cache_root_ttl; |
725 | |
725 | |
726 | if (!ctx.qry.page) |
726 | if (!ctx.qry.page) |
727 | return ctx.cfg.cache_repo_ttl; |
727 | return ctx.cfg.cache_repo_ttl; |
728 | |
728 | |
729 | if (ctx.qry.has_symref) |
729 | if (ctx.qry.has_symref) |
730 | return ctx.cfg.cache_dynamic_ttl; |
730 | return ctx.cfg.cache_dynamic_ttl; |
731 | |
731 | |
732 | if (ctx.qry.has_sha1) |
732 | if (ctx.qry.has_sha1) |
733 | return ctx.cfg.cache_static_ttl; |
733 | return ctx.cfg.cache_static_ttl; |
734 | |
734 | |
735 | return ctx.cfg.cache_repo_ttl; |
735 | return ctx.cfg.cache_repo_ttl; |
736 | } |
736 | } |
737 | |
737 | |
738 | int main(int argc, const char **argv) |
738 | int main(int argc, const char **argv) |
739 | { |
739 | { |
740 | const char *path; |
740 | const char *path; |
741 | char *qry; |
741 | char *qry; |
742 | int err, ttl; |
742 | int err, ttl; |
743 | |
743 | |
744 | prepare_context(&ctx); |
744 | prepare_context(&ctx); |
745 | cgit_repolist.length = 0; |
745 | cgit_repolist.length = 0; |
746 | cgit_repolist.count = 0; |
746 | cgit_repolist.count = 0; |
747 | cgit_repolist.repos = NULL; |
747 | cgit_repolist.repos = NULL; |
748 | |
748 | |
749 | cgit_parse_args(argc, argv); |
749 | cgit_parse_args(argc, argv); |
750 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
750 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
751 | ctx.repo = NULL; |
751 | ctx.repo = NULL; |
752 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
752 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
753 | |
753 | |
754 | /* If virtual-root isn't specified in cgitrc, lets pretend |
754 | /* If virtual-root isn't specified in cgitrc, lets pretend |
755 | * that virtual-root equals SCRIPT_NAME. |
755 | * that virtual-root equals SCRIPT_NAME, minus any possibly |
| |
756 | * trailing slashes. |
756 | */ |
757 | */ |
757 | if (!ctx.cfg.virtual_root) |
758 | if (!ctx.cfg.virtual_root) |
758 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
759 | ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); |
759 | |
760 | |
760 | /* If no url parameter is specified on the querystring, lets |
761 | /* If no url parameter is specified on the querystring, lets |
761 | * use PATH_INFO as url. This allows cgit to work with virtual |
762 | * use PATH_INFO as url. This allows cgit to work with virtual |
762 | * urls without the need for rewriterules in the webserver (as |
763 | * urls without the need for rewriterules in the webserver (as |
763 | * long as PATH_INFO is included in the cache lookup key). |
764 | * long as PATH_INFO is included in the cache lookup key). |
764 | */ |
765 | */ |
765 | path = ctx.env.path_info; |
766 | path = ctx.env.path_info; |
766 | if (!ctx.qry.url && path) { |
767 | if (!ctx.qry.url && path) { |
767 | if (path[0] == '/') |
768 | if (path[0] == '/') |
768 | path++; |
769 | path++; |
769 | ctx.qry.url = xstrdup(path); |
770 | ctx.qry.url = xstrdup(path); |
770 | if (ctx.qry.raw) { |
771 | if (ctx.qry.raw) { |
771 | qry = ctx.qry.raw; |
772 | qry = ctx.qry.raw; |
772 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
773 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
773 | free(qry); |
774 | free(qry); |
774 | } else |
775 | } else |
775 | ctx.qry.raw = xstrdup(ctx.qry.url); |
776 | ctx.qry.raw = xstrdup(ctx.qry.url); |
776 | cgit_parse_url(ctx.qry.url); |
777 | cgit_parse_url(ctx.qry.url); |
777 | } |
778 | } |
778 | |
779 | |
779 | ttl = calc_ttl(); |
780 | ttl = calc_ttl(); |
780 | ctx.page.expires += ttl*60; |
781 | ctx.page.expires += ttl*60; |
781 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
782 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
782 | ctx.cfg.nocache = 1; |
783 | ctx.cfg.nocache = 1; |
783 | if (ctx.cfg.nocache) |
784 | if (ctx.cfg.nocache) |
784 | ctx.cfg.cache_size = 0; |
785 | ctx.cfg.cache_size = 0; |
785 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
786 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
786 | ctx.qry.raw, ttl, process_request, &ctx); |
787 | ctx.qry.raw, ttl, process_request, &ctx); |
787 | if (err) |
788 | if (err) |
788 | cgit_print_error(fmt("Error processing page: %s (%d)", |
789 | cgit_print_error(fmt("Error processing page: %s (%d)", |
789 | strerror(err), err)); |
790 | strerror(err), err)); |
790 | return err; |
791 | return err; |
791 | } |
792 | } |
|