-rw-r--r-- | cgit.c | 64 |
1 files changed, 49 insertions, 15 deletions
@@ -12,3 +12,18 @@ const char cgit_version[] = CGIT_VERSION; -static void cgit_prepare_cache(struct cacheitem *item) + +static struct repoinfo *cgit_get_repoinfo(char *url) +{ + int i; + struct repoinfo *repo; + + for (i=0; i<cgit_repolist.count; i++) { + repo = &cgit_repolist.repos[i]; + if (!strcmp(repo->url, url)) + return repo; + } + return NULL; +} + + +static int cgit_prepare_cache(struct cacheitem *item) { @@ -17,5 +32,17 @@ static void cgit_prepare_cache(struct cacheitem *item) item->ttl = cgit_cache_root_ttl; - } else if (!cgit_query_page) { + return 1; + } + cgit_repo = cgit_get_repoinfo(cgit_query_repo); + if (!cgit_repo) { + char *title = fmt("%s - %s", cgit_root_title, "Bad request"); + cgit_print_docstart(title, item); + cgit_print_pageheader(title, 0); + cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); + cgit_print_docend(); + return 0; + } + + if (!cgit_query_page) { item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, - cgit_query_repo)); + cgit_repo->url)); item->ttl = cgit_cache_repo_ttl; @@ -23,3 +50,3 @@ static void cgit_prepare_cache(struct cacheitem *item) item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, - cgit_query_repo, cgit_query_page, + cgit_repo->url, cgit_query_page, cache_safe_filename(cgit_querystring))); @@ -32,2 +59,3 @@ static void cgit_prepare_cache(struct cacheitem *item) } + return 1; } @@ -36,5 +64,7 @@ static void cgit_print_repo_page(struct cacheitem *item) { - if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || - cgit_read_config("info/cgit", cgit_repo_config_cb)) { - char *title = fmt("%s - %s", cgit_root_title, "Bad request"); + char *title; + int show_search; + + if (chdir(cgit_repo->path)) { + title = fmt("%s - %s", cgit_root_title, "Bad request"); cgit_print_docstart(title, item); @@ -46,5 +76,6 @@ static void cgit_print_repo_page(struct cacheitem *item) } - setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); - char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); - int show_search = 0; + + title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); + show_search = 0; + setenv("GIT_DIR", cgit_repo->path, 1); if (cgit_query_page && !strcmp(cgit_query_page, "log")) @@ -133,5 +164,2 @@ static void cgit_parse_args(int argc, const char **argv) for (i = 1; i < argc; i++) { - if (!strncmp(argv[i], "--root=", 7)) { - cgit_root = xstrdup(argv[i]+7); - } if (!strncmp(argv[i], "--cache=", 8)) { @@ -169,2 +197,8 @@ int main(int argc, const char **argv) + htmlfd = STDOUT_FILENO; + item.st.st_mtime = time(NULL); + cgit_repolist.length = 0; + cgit_repolist.count = 0; + cgit_repolist.repos = NULL; + cgit_read_config("/etc/cgitrc", cgit_global_config_cb); @@ -174,4 +208,4 @@ int main(int argc, const char **argv) cgit_parse_query(cgit_querystring, cgit_querystring_cb); - - cgit_prepare_cache(&item); + if (!cgit_prepare_cache(&item)) + return 0; if (cgit_nocache) { |