X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c6cf3a424a0860d69b290254d9b19d35527b2d27..6ec5f36f279a85f59db2851ab476d9acd0015770:/cgit.c diff --git a/cgit.c b/cgit.c index aee7ba3..cc18ed4 100644 --- a/cgit.c +++ b/cgit.c @@ -8,32 +8,9 @@ #include "cgit.h" -const char cgit_version[] = CGIT_VERSION; - - -static struct repoinfo *cgit_get_repoinfo(char *url) -{ - int i; - struct repoinfo *repo; - - for (i=0; iurl, url)) - return repo; - } - return NULL; -} - - static int cgit_prepare_cache(struct cacheitem *item) { - if (!cgit_query_repo) { - item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); - item->ttl = cgit_cache_root_ttl; - return 1; - } - cgit_repo = cgit_get_repoinfo(cgit_query_repo); - if (!cgit_repo) { + if (!cgit_repo && cgit_query_repo) { char *title = fmt("%s - %s", cgit_root_title, "Bad request"); cgit_print_docstart(title, item); cgit_print_pageheader(title, 0); @@ -42,14 +19,22 @@ static int cgit_prepare_cache(struct cacheitem *item) return 0; } - if (!cgit_query_page) { - item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, - cgit_repo->url)); + if (!cgit_repo) { + item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); + item->ttl = cgit_cache_root_ttl; + return 1; + } + + if (!cgit_cmd) { + item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, + cache_safe_filename(cgit_repo->url), + cache_safe_filename(cgit_querystring))); item->ttl = cgit_cache_repo_ttl; } else { - item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, - cgit_repo->url, cgit_query_page, - cache_safe_filename(cgit_querystring))); + item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, + cache_safe_filename(cgit_repo->url), + cgit_query_page, + cache_safe_filename(cgit_querystring))); if (cgit_query_has_symref) item->ttl = cgit_cache_dynamic_ttl; else if (cgit_query_has_sha1) @@ -65,6 +50,9 @@ static void cgit_print_repo_page(struct cacheitem *item) char *title; int show_search; + if (!cgit_query_head) + cgit_query_head = cgit_repo->defbranch; + if (chdir(cgit_repo->path)) { title = fmt("%s - %s", cgit_root_title, "Bad request"); cgit_print_docstart(title, item); @@ -79,25 +67,22 @@ static void cgit_print_repo_page(struct cacheitem *item) show_search = 0; setenv("GIT_DIR", cgit_repo->path, 1); - if (cgit_query_page) { - if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { - cgit_print_snapshot(item, cgit_query_sha1, "zip", - cgit_repo->url, cgit_query_name); + if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { + cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, + cgit_repobasename(cgit_repo->url), + cgit_query_path, + cgit_repo->snapshots ); return; - } - if (!strcmp(cgit_query_page, "blob")) { - cgit_print_blob(item, cgit_query_sha1, cgit_query_path); - return; - } } - if (cgit_query_page && !strcmp(cgit_query_page, "log")) - show_search = 1; + if (cgit_cmd == CMD_BLOB) { + cgit_print_blob(item, cgit_query_sha1, cgit_query_path); + return; + } + show_search = (cgit_cmd == CMD_LOG); cgit_print_docstart(title, item); - - - if (!cgit_query_page) { + if (!cgit_cmd) { cgit_print_pageheader("summary", show_search); cgit_print_summary(); cgit_print_docend(); @@ -106,18 +91,28 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_pageheader(cgit_query_page, show_search); - if (!strcmp(cgit_query_page, "log")) { - cgit_print_log(cgit_query_head, cgit_query_ofs, - cgit_max_commit_count, cgit_query_search); - } else if (!strcmp(cgit_query_page, "tree")) { + switch(cgit_cmd) { + case CMD_LOG: + cgit_print_log(cgit_query_sha1, cgit_query_ofs, + cgit_max_commit_count, cgit_query_search, + cgit_query_path, 1); + break; + case CMD_TREE: cgit_print_tree(cgit_query_sha1, cgit_query_path); - } else if (!strcmp(cgit_query_page, "commit")) { + break; + case CMD_COMMIT: cgit_print_commit(cgit_query_sha1); - } else if (!strcmp(cgit_query_page, "view")) { - cgit_print_view(cgit_query_sha1, cgit_query_path); - } else if (!strcmp(cgit_query_page, "diff")) { - cgit_print_diff(cgit_query_sha1, cgit_query_sha2); - } else { + break; + case CMD_REFS: + cgit_print_refs(); + break; + case CMD_TAG: + cgit_print_tag(cgit_query_sha1); + break; + case CMD_DIFF: + cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); + break; + default: cgit_print_error("Invalid request"); } cgit_print_docend(); @@ -132,20 +127,20 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache) item->st.st_mtime = time(NULL); if (use_cache) { - stdout2 = chk_positive(dup(STDOUT_FILENO), + stdout2 = chk_positive(dup(STDOUT_FILENO), "Preserving STDOUT"); chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); } - if (cgit_query_repo) + if (cgit_repo) cgit_print_repo_page(item); else cgit_print_repolist(item); if (use_cache) { chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); - chk_positive(dup2(stdout2, STDOUT_FILENO), + chk_positive(dup2(stdout2, STDOUT_FILENO), "Restoring original STDOUT"); chk_zero(close(stdout2), "Closing temporary STDOUT"); } @@ -235,6 +230,7 @@ static void cgit_parse_args(int argc, const char **argv) int main(int argc, const char **argv) { struct cacheitem item; + const char *cgit_config_env = getenv("CGIT_CONFIG"); htmlfd = STDOUT_FILENO; item.st.st_mtime = time(NULL); @@ -242,7 +238,11 @@ int main(int argc, const char **argv) cgit_repolist.count = 0; cgit_repolist.repos = NULL; - cgit_read_config("/etc/cgitrc", cgit_global_config_cb); + cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, + cgit_global_config_cb); + cgit_repo = NULL; + if (getenv("SCRIPT_NAME")) + cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); if (getenv("QUERY_STRING")) cgit_querystring = xstrdup(getenv("QUERY_STRING")); cgit_parse_args(argc, argv);