aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c60
1 files changed, 31 insertions, 29 deletions
diff --git a/cgit.c b/cgit.c
index 431e8fb..e5d8fbd 100644
--- a/cgit.c
+++ b/cgit.c
@@ -13,13 +13,7 @@ const char cgit_version[] = CGIT_VERSION;
13 13
14static int cgit_prepare_cache(struct cacheitem *item) 14static int cgit_prepare_cache(struct cacheitem *item)
15{ 15{
16 if (!cgit_query_repo) { 16 if (!cgit_repo && cgit_query_repo) {
17 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
18 item->ttl = cgit_cache_root_ttl;
19 return 1;
20 }
21 cgit_repo = cgit_get_repoinfo(cgit_query_repo);
22 if (!cgit_repo) {
23 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 17 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
24 cgit_print_docstart(title, item); 18 cgit_print_docstart(title, item);
25 cgit_print_pageheader(title, 0); 19 cgit_print_pageheader(title, 0);
@@ -28,13 +22,19 @@ static int cgit_prepare_cache(struct cacheitem *item)
28 return 0; 22 return 0;
29 } 23 }
30 24
31 if (!cgit_query_page) { 25 if (!cgit_repo) {
26 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
27 item->ttl = cgit_cache_root_ttl;
28 return 1;
29 }
30
31 if (!cgit_cmd) {
32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
33 cgit_repo->url)); 33 cache_safe_filename(cgit_repo->url)));
34 item->ttl = cgit_cache_repo_ttl; 34 item->ttl = cgit_cache_repo_ttl;
35 } else { 35 } else {
36 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 36 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
37 cgit_repo->url, cgit_query_page, 37 cache_safe_filename(cgit_repo->url), cgit_query_page,
38 cache_safe_filename(cgit_querystring))); 38 cache_safe_filename(cgit_querystring)));
39 if (cgit_query_has_symref) 39 if (cgit_query_has_symref)
40 item->ttl = cgit_cache_dynamic_ttl; 40 item->ttl = cgit_cache_dynamic_ttl;
@@ -68,25 +68,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
68 show_search = 0; 68 show_search = 0;
69 setenv("GIT_DIR", cgit_repo->path, 1); 69 setenv("GIT_DIR", cgit_repo->path, 1);
70 70
71 if (cgit_query_page) { 71 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
72 if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
73 cgit_print_snapshot(item, cgit_query_sha1, "zip", 72 cgit_print_snapshot(item, cgit_query_sha1, "zip",
74 cgit_repo->url, cgit_query_name); 73 cgit_repo->url, cgit_query_name);
75 return; 74 return;
76 }
77 if (!strcmp(cgit_query_page, "blob")) {
78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return;
80 }
81 } 75 }
82 76
83 if (cgit_query_page && !strcmp(cgit_query_page, "log")) 77 if (cgit_cmd == CMD_BLOB) {
84 show_search = 1; 78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return;
80 }
85 81
82 show_search = (cgit_cmd == CMD_LOG);
86 cgit_print_docstart(title, item); 83 cgit_print_docstart(title, item);
87 84 if (!cgit_cmd) {
88
89 if (!cgit_query_page) {
90 cgit_print_pageheader("summary", show_search); 85 cgit_print_pageheader("summary", show_search);
91 cgit_print_summary(); 86 cgit_print_summary();
92 cgit_print_docend(); 87 cgit_print_docend();
@@ -95,20 +90,26 @@ static void cgit_print_repo_page(struct cacheitem *item)
95 90
96 cgit_print_pageheader(cgit_query_page, show_search); 91 cgit_print_pageheader(cgit_query_page, show_search);
97 92
98 if (!strcmp(cgit_query_page, "log")) { 93 switch(cgit_cmd) {
94 case CMD_LOG:
99 cgit_print_log(cgit_query_head, cgit_query_ofs, 95 cgit_print_log(cgit_query_head, cgit_query_ofs,
100 cgit_max_commit_count, cgit_query_search, 96 cgit_max_commit_count, cgit_query_search,
101 cgit_query_path); 97 cgit_query_path);
102 } else if (!strcmp(cgit_query_page, "tree")) { 98 break;
99 case CMD_TREE:
103 cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); 100 cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
104 } else if (!strcmp(cgit_query_page, "commit")) { 101 break;
102 case CMD_COMMIT:
105 cgit_print_commit(cgit_query_head); 103 cgit_print_commit(cgit_query_head);
106 } else if (!strcmp(cgit_query_page, "view")) { 104 break;
105 case CMD_VIEW:
107 cgit_print_view(cgit_query_sha1, cgit_query_path); 106 cgit_print_view(cgit_query_sha1, cgit_query_path);
108 } else if (!strcmp(cgit_query_page, "diff")) { 107 break;
108 case CMD_DIFF:
109 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, 109 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
110 cgit_query_path); 110 cgit_query_path);
111 } else { 111 break;
112 default:
112 cgit_print_error("Invalid request"); 113 cgit_print_error("Invalid request");
113 } 114 }
114 cgit_print_docend(); 115 cgit_print_docend();
@@ -129,7 +130,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
129 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
130 } 131 }
131 132
132 if (cgit_query_repo) 133 if (cgit_repo)
133 cgit_print_repo_page(item); 134 cgit_print_repo_page(item);
134 else 135 else
135 cgit_print_repolist(item); 136 cgit_print_repolist(item);
@@ -234,6 +235,7 @@ int main(int argc, const char **argv)
234 cgit_repolist.repos = NULL; 235 cgit_repolist.repos = NULL;
235 236
236 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); 237 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
238 cgit_repo = NULL;
237 if (getenv("SCRIPT_NAME")) 239 if (getenv("SCRIPT_NAME"))
238 cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); 240 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
239 if (getenv("QUERY_STRING")) 241 if (getenv("QUERY_STRING"))