aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-05-21 05:09:55 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-21 05:09:55 (JST)
commitdc3ac3f76077c5d612d42e8beb4878e43acfc58a (patch)
treedfb996c0ce9833841578e1f0accbb5a387c01237 /cgit.c
parent977a0b173df6fe1a4d362fe4c70f9badff1fd46c (diff)
parent3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (diff)
downloadcgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.zip
cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.gz
Merge branch 'virtual-url'
* virtual-url: Don't be fooled by trailing '/' in url-parameter cache_safe_filename() needs more buffers Enable url=value querystring parameter Add lookup-function for valid repo commands Move cgit_get_repoinfo into shared.c
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c74
1 files changed, 31 insertions, 43 deletions
diff --git a/cgit.c b/cgit.c
index 3e7e595..e5d8fbd 100644
--- a/cgit.c
+++ b/cgit.c
@@ -11,29 +11,9 @@
11const char cgit_version[] = CGIT_VERSION; 11const char cgit_version[] = CGIT_VERSION;
12 12
13 13
14static struct repoinfo *cgit_get_repoinfo(char *url)
15{
16 int i;
17 struct repoinfo *repo;
18
19 for (i=0; i<cgit_repolist.count; i++) {
20 repo = &cgit_repolist.repos[i];
21 if (!strcmp(repo->url, url))
22 return repo;
23 }
24 return NULL;
25}
26
27
28static int cgit_prepare_cache(struct cacheitem *item) 14static int cgit_prepare_cache(struct cacheitem *item)
29{ 15{
30 if (!cgit_query_repo) { 16 if (!cgit_repo && cgit_query_repo) {
31 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
32 item->ttl = cgit_cache_root_ttl;
33 return 1;
34 }
35 cgit_repo = cgit_get_repoinfo(cgit_query_repo);
36 if (!cgit_repo) {
37 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 17 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
38 cgit_print_docstart(title, item); 18 cgit_print_docstart(title, item);
39 cgit_print_pageheader(title, 0); 19 cgit_print_pageheader(title, 0);
@@ -42,13 +22,19 @@ static int cgit_prepare_cache(struct cacheitem *item)
42 return 0; 22 return 0;
43 } 23 }
44 24
45 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) {
46 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
47 cgit_repo->url)); 33 cache_safe_filename(cgit_repo->url)));
48 item->ttl = cgit_cache_repo_ttl; 34 item->ttl = cgit_cache_repo_ttl;
49 } else { 35 } else {
50 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,
51 cgit_repo->url, cgit_query_page, 37 cache_safe_filename(cgit_repo->url), cgit_query_page,
52 cache_safe_filename(cgit_querystring))); 38 cache_safe_filename(cgit_querystring)));
53 if (cgit_query_has_symref) 39 if (cgit_query_has_symref)
54 item->ttl = cgit_cache_dynamic_ttl; 40 item->ttl = cgit_cache_dynamic_ttl;
@@ -82,25 +68,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
82 show_search = 0; 68 show_search = 0;
83 setenv("GIT_DIR", cgit_repo->path, 1); 69 setenv("GIT_DIR", cgit_repo->path, 1);
84 70
85 if (cgit_query_page) { 71 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
86 if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
87 cgit_print_snapshot(item, cgit_query_sha1, "zip", 72 cgit_print_snapshot(item, cgit_query_sha1, "zip",
88 cgit_repo->url, cgit_query_name); 73 cgit_repo->url, cgit_query_name);
89 return; 74 return;
90 }
91 if (!strcmp(cgit_query_page, "blob")) {
92 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
93 return;
94 }
95 } 75 }
96 76
97 if (cgit_query_page && !strcmp(cgit_query_page, "log")) 77 if (cgit_cmd == CMD_BLOB) {
98 show_search = 1; 78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return;
80 }
99 81
82 show_search = (cgit_cmd == CMD_LOG);
100 cgit_print_docstart(title, item); 83 cgit_print_docstart(title, item);
101 84 if (!cgit_cmd) {
102
103 if (!cgit_query_page) {
104 cgit_print_pageheader("summary", show_search); 85 cgit_print_pageheader("summary", show_search);
105 cgit_print_summary(); 86 cgit_print_summary();
106 cgit_print_docend(); 87 cgit_print_docend();
@@ -109,20 +90,26 @@ static void cgit_print_repo_page(struct cacheitem *item)
109 90
110 cgit_print_pageheader(cgit_query_page, show_search); 91 cgit_print_pageheader(cgit_query_page, show_search);
111 92
112 if (!strcmp(cgit_query_page, "log")) { 93 switch(cgit_cmd) {
94 case CMD_LOG:
113 cgit_print_log(cgit_query_head, cgit_query_ofs, 95 cgit_print_log(cgit_query_head, cgit_query_ofs,
114 cgit_max_commit_count, cgit_query_search, 96 cgit_max_commit_count, cgit_query_search,
115 cgit_query_path); 97 cgit_query_path);
116 } else if (!strcmp(cgit_query_page, "tree")) { 98 break;
99 case CMD_TREE:
117 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);
118 } else if (!strcmp(cgit_query_page, "commit")) { 101 break;
102 case CMD_COMMIT:
119 cgit_print_commit(cgit_query_head); 103 cgit_print_commit(cgit_query_head);
120 } else if (!strcmp(cgit_query_page, "view")) { 104 break;
105 case CMD_VIEW:
121 cgit_print_view(cgit_query_sha1, cgit_query_path); 106 cgit_print_view(cgit_query_sha1, cgit_query_path);
122 } else if (!strcmp(cgit_query_page, "diff")) { 107 break;
108 case CMD_DIFF:
123 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,
124 cgit_query_path); 110 cgit_query_path);
125 } else { 111 break;
112 default:
126 cgit_print_error("Invalid request"); 113 cgit_print_error("Invalid request");
127 } 114 }
128 cgit_print_docend(); 115 cgit_print_docend();
@@ -143,7 +130,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
143 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
144 } 131 }
145 132
146 if (cgit_query_repo) 133 if (cgit_repo)
147 cgit_print_repo_page(item); 134 cgit_print_repo_page(item);
148 else 135 else
149 cgit_print_repolist(item); 136 cgit_print_repolist(item);
@@ -248,6 +235,7 @@ int main(int argc, const char **argv)
248 cgit_repolist.repos = NULL; 235 cgit_repolist.repos = NULL;
249 236
250 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); 237 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
238 cgit_repo = NULL;
251 if (getenv("SCRIPT_NAME")) 239 if (getenv("SCRIPT_NAME"))
252 cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); 240 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
253 if (getenv("QUERY_STRING")) 241 if (getenv("QUERY_STRING"))