aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cache.c4
-rw-r--r--cgit.c72
-rw-r--r--cgit.h35
-rw-r--r--parsing.c8
-rw-r--r--shared.c43
-rw-r--r--ui-commit.c14
-rw-r--r--ui-diff.c6
-rw-r--r--ui-log.c20
-rw-r--r--ui-patch.c2
-rw-r--r--ui-refs.c4
-rw-r--r--ui-shared.c86
-rw-r--r--ui-summary.c6
-rw-r--r--ui-tree.c20
13 files changed, 156 insertions, 164 deletions
diff --git a/cache.c b/cache.c
index 372e38d..b162952 100644
--- a/cache.c
+++ b/cache.c
@@ -57,10 +57,10 @@ int cache_create_dirs()
57 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 57 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
58 return 0; 58 return 0;
59 59
60 if (cgit_query_page) { 60 if (ctx.qry.page) {
61 path = fmt("%s/%s/%s", cgit_cache_root, 61 path = fmt("%s/%s/%s", cgit_cache_root,
62 cache_safe_filename(cgit_repo->url), 62 cache_safe_filename(cgit_repo->url),
63 cgit_query_page); 63 ctx.qry.page);
64 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 64 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
65 return 0; 65 return 0;
66 } 66 }
diff --git a/cgit.c b/cgit.c
index e8acc03..8a30c3c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,11 +10,11 @@
10 10
11static int cgit_prepare_cache(struct cacheitem *item) 11static int cgit_prepare_cache(struct cacheitem *item)
12{ 12{
13 if (!cgit_repo && cgit_query_repo) { 13 if (!cgit_repo && ctx.qry.repo) {
14 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 14 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
15 cgit_print_docstart(title, item); 15 cgit_print_docstart(title, item);
16 cgit_print_pageheader(title, 0); 16 cgit_print_pageheader(title, 0);
17 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); 17 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
18 cgit_print_docend(); 18 cgit_print_docend();
19 return 0; 19 return 0;
20 } 20 }
@@ -28,16 +28,16 @@ static int cgit_prepare_cache(struct cacheitem *item)
28 if (!cgit_cmd) { 28 if (!cgit_cmd) {
29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, 29 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
30 cache_safe_filename(cgit_repo->url), 30 cache_safe_filename(cgit_repo->url),
31 cache_safe_filename(cgit_querystring))); 31 cache_safe_filename(ctx.qry.raw)));
32 item->ttl = cgit_cache_repo_ttl; 32 item->ttl = cgit_cache_repo_ttl;
33 } else { 33 } else {
34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 34 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
35 cache_safe_filename(cgit_repo->url), 35 cache_safe_filename(cgit_repo->url),
36 cgit_query_page, 36 ctx.qry.page,
37 cache_safe_filename(cgit_querystring))); 37 cache_safe_filename(ctx.qry.raw)));
38 if (cgit_query_has_symref) 38 if (ctx.qry.has_symref)
39 item->ttl = cgit_cache_dynamic_ttl; 39 item->ttl = cgit_cache_dynamic_ttl;
40 else if (cgit_query_has_sha1) 40 else if (ctx.qry.has_sha1)
41 item->ttl = cgit_cache_static_ttl; 41 item->ttl = cgit_cache_static_ttl;
42 else 42 else
43 item->ttl = cgit_cache_repo_ttl; 43 item->ttl = cgit_cache_repo_ttl;
@@ -98,12 +98,12 @@ static void cgit_print_repo_page(struct cacheitem *item)
98 show_search = 0; 98 show_search = 0;
99 setenv("GIT_DIR", cgit_repo->path, 1); 99 setenv("GIT_DIR", cgit_repo->path, 1);
100 100
101 if (!cgit_query_head) { 101 if (!ctx.qry.head) {
102 cgit_query_head = xstrdup(find_default_branch(cgit_repo)); 102 ctx.qry.head = xstrdup(find_default_branch(cgit_repo));
103 cgit_repo->defbranch = cgit_query_head; 103 cgit_repo->defbranch = ctx.qry.head;
104 } 104 }
105 105
106 if (!cgit_query_head) { 106 if (!ctx.qry.head) {
107 cgit_print_docstart(title, item); 107 cgit_print_docstart(title, item);
108 cgit_print_pageheader(title, 0); 108 cgit_print_pageheader(title, 0);
109 cgit_print_error("Repository seems to be empty"); 109 cgit_print_error("Repository seems to be empty");
@@ -111,9 +111,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
111 return; 111 return;
112 } 112 }
113 113
114 if (get_sha1(cgit_query_head, sha1)) { 114 if (get_sha1(ctx.qry.head, sha1)) {
115 tmp = xstrdup(cgit_query_head); 115 tmp = xstrdup(ctx.qry.head);
116 cgit_query_head = cgit_repo->defbranch; 116 ctx.qry.head = cgit_repo->defbranch;
117 cgit_print_docstart(title, item); 117 cgit_print_docstart(title, item);
118 cgit_print_pageheader(title, 0); 118 cgit_print_pageheader(title, 0);
119 cgit_print_error(fmt("Invalid branch: %s", tmp)); 119 cgit_print_error(fmt("Invalid branch: %s", tmp));
@@ -122,20 +122,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
122 } 122 }
123 123
124 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { 124 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
125 cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, 125 cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
126 cgit_repobasename(cgit_repo->url), 126 cgit_repobasename(cgit_repo->url),
127 cgit_query_path, 127 ctx.qry.path,
128 cgit_repo->snapshots ); 128 cgit_repo->snapshots );
129 return; 129 return;
130 } 130 }
131 131
132 if (cgit_cmd == CMD_PATCH) { 132 if (cgit_cmd == CMD_PATCH) {
133 cgit_print_patch(cgit_query_sha1, item); 133 cgit_print_patch(ctx.qry.sha1, item);
134 return; 134 return;
135 } 135 }
136 136
137 if (cgit_cmd == CMD_BLOB) { 137 if (cgit_cmd == CMD_BLOB) {
138 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 138 cgit_print_blob(item, ctx.qry.sha1, ctx.qry.path);
139 return; 139 return;
140 } 140 }
141 141
@@ -148,28 +148,28 @@ static void cgit_print_repo_page(struct cacheitem *item)
148 return; 148 return;
149 } 149 }
150 150
151 cgit_print_pageheader(cgit_query_page, show_search); 151 cgit_print_pageheader(ctx.qry.page, show_search);
152 152
153 switch(cgit_cmd) { 153 switch(cgit_cmd) {
154 case CMD_LOG: 154 case CMD_LOG:
155 cgit_print_log(cgit_query_sha1, cgit_query_ofs, 155 cgit_print_log(ctx.qry.sha1, ctx.qry.ofs,
156 cgit_max_commit_count, cgit_query_grep, cgit_query_search, 156 cgit_max_commit_count, ctx.qry.grep, ctx.qry.search,
157 cgit_query_path, 1); 157 ctx.qry.path, 1);
158 break; 158 break;
159 case CMD_TREE: 159 case CMD_TREE:
160 cgit_print_tree(cgit_query_sha1, cgit_query_path); 160 cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
161 break; 161 break;
162 case CMD_COMMIT: 162 case CMD_COMMIT:
163 cgit_print_commit(cgit_query_sha1); 163 cgit_print_commit(ctx.qry.sha1);
164 break; 164 break;
165 case CMD_REFS: 165 case CMD_REFS:
166 cgit_print_refs(); 166 cgit_print_refs();
167 break; 167 break;
168 case CMD_TAG: 168 case CMD_TAG:
169 cgit_print_tag(cgit_query_sha1); 169 cgit_print_tag(ctx.qry.sha1);
170 break; 170 break;
171 case CMD_DIFF: 171 case CMD_DIFF:
172 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); 172 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
173 break; 173 break;
174 default: 174 default:
175 cgit_print_error("Invalid request"); 175 cgit_print_error("Invalid request");
@@ -264,24 +264,24 @@ static void cgit_parse_args(int argc, const char **argv)
264 cgit_nocache = 1; 264 cgit_nocache = 1;
265 } 265 }
266 if (!strncmp(argv[i], "--query=", 8)) { 266 if (!strncmp(argv[i], "--query=", 8)) {
267 cgit_querystring = xstrdup(argv[i]+8); 267 ctx.qry.raw = xstrdup(argv[i]+8);
268 } 268 }
269 if (!strncmp(argv[i], "--repo=", 7)) { 269 if (!strncmp(argv[i], "--repo=", 7)) {
270 cgit_query_repo = xstrdup(argv[i]+7); 270 ctx.qry.repo = xstrdup(argv[i]+7);
271 } 271 }
272 if (!strncmp(argv[i], "--page=", 7)) { 272 if (!strncmp(argv[i], "--page=", 7)) {
273 cgit_query_page = xstrdup(argv[i]+7); 273 ctx.qry.page = xstrdup(argv[i]+7);
274 } 274 }
275 if (!strncmp(argv[i], "--head=", 7)) { 275 if (!strncmp(argv[i], "--head=", 7)) {
276 cgit_query_head = xstrdup(argv[i]+7); 276 ctx.qry.head = xstrdup(argv[i]+7);
277 cgit_query_has_symref = 1; 277 ctx.qry.has_symref = 1;
278 } 278 }
279 if (!strncmp(argv[i], "--sha1=", 7)) { 279 if (!strncmp(argv[i], "--sha1=", 7)) {
280 cgit_query_sha1 = xstrdup(argv[i]+7); 280 ctx.qry.sha1 = xstrdup(argv[i]+7);
281 cgit_query_has_sha1 = 1; 281 ctx.qry.has_sha1 = 1;
282 } 282 }
283 if (!strncmp(argv[i], "--ofs=", 6)) { 283 if (!strncmp(argv[i], "--ofs=", 6)) {
284 cgit_query_ofs = atoi(argv[i]+6); 284 ctx.qry.ofs = atoi(argv[i]+6);
285 } 285 }
286 } 286 }
287} 287}
@@ -303,9 +303,9 @@ int main(int argc, const char **argv)
303 if (getenv("SCRIPT_NAME")) 303 if (getenv("SCRIPT_NAME"))
304 cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); 304 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
305 if (getenv("QUERY_STRING")) 305 if (getenv("QUERY_STRING"))
306 cgit_querystring = xstrdup(getenv("QUERY_STRING")); 306 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
307 cgit_parse_args(argc, argv); 307 cgit_parse_args(argc, argv);
308 cgit_parse_query(cgit_querystring, cgit_querystring_cb); 308 cgit_parse_query(ctx.qry.raw, cgit_querystring_cb);
309 if (!cgit_prepare_cache(&item)) 309 if (!cgit_prepare_cache(&item))
310 return 0; 310 return 0;
311 if (cgit_nocache) { 311 if (cgit_nocache) {
diff --git a/cgit.h b/cgit.h
index 66c40b9..4576efb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -123,10 +123,31 @@ struct reflist {
123 int count; 123 int count;
124}; 124};
125 125
126struct cgit_query {
127 int has_symref;
128 int has_sha1;
129 char *raw;
130 char *repo;
131 char *page;
132 char *search;
133 char *grep;
134 char *head;
135 char *sha1;
136 char *sha2;
137 char *path;
138 char *name;
139 int ofs;
140};
141
142struct cgit_context {
143 struct cgit_query qry;
144};
145
126extern const char *cgit_version; 146extern const char *cgit_version;
127 147
128extern struct repolist cgit_repolist; 148extern struct repolist cgit_repolist;
129extern struct repoinfo *cgit_repo; 149extern struct repoinfo *cgit_repo;
150extern struct cgit_context ctx;
130extern int cgit_cmd; 151extern int cgit_cmd;
131 152
132extern char *cgit_root_title; 153extern char *cgit_root_title;
@@ -163,20 +184,6 @@ extern int cgit_max_msg_len;
163extern int cgit_max_repodesc_len; 184extern int cgit_max_repodesc_len;
164extern int cgit_max_commit_count; 185extern int cgit_max_commit_count;
165 186
166extern int cgit_query_has_symref;
167extern int cgit_query_has_sha1;
168
169extern char *cgit_querystring;
170extern char *cgit_query_repo;
171extern char *cgit_query_page;
172extern char *cgit_query_search;
173extern char *cgit_query_grep;
174extern char *cgit_query_head;
175extern char *cgit_query_sha1;
176extern char *cgit_query_sha2;
177extern char *cgit_query_path;
178extern char *cgit_query_name;
179extern int cgit_query_ofs;
180 187
181extern int htmlfd; 188extern int htmlfd;
182 189
diff --git a/parsing.c b/parsing.c
index 5093b8b..8cf56a4 100644
--- a/parsing.c
+++ b/parsing.c
@@ -149,7 +149,7 @@ void cgit_parse_url(const char *url)
149 149
150 cgit_repo = cgit_get_repoinfo(url); 150 cgit_repo = cgit_get_repoinfo(url);
151 if (cgit_repo) { 151 if (cgit_repo) {
152 cgit_query_repo = cgit_repo->url; 152 ctx.qry.repo = cgit_repo->url;
153 return; 153 return;
154 } 154 }
155 155
@@ -163,15 +163,15 @@ void cgit_parse_url(const char *url)
163 continue; 163 continue;
164 } 164 }
165 165
166 cgit_query_repo = cgit_repo->url; 166 ctx.qry.repo = cgit_repo->url;
167 p = strchr(cmd + 1, '/'); 167 p = strchr(cmd + 1, '/');
168 if (p) { 168 if (p) {
169 p[0] = '\0'; 169 p[0] = '\0';
170 if (p[1]) 170 if (p[1])
171 cgit_query_path = trim_end(p + 1, '/'); 171 ctx.qry.path = trim_end(p + 1, '/');
172 } 172 }
173 cgit_cmd = cgit_get_cmd_index(cmd + 1); 173 cgit_cmd = cgit_get_cmd_index(cmd + 1);
174 cgit_query_page = xstrdup(cmd + 1); 174 ctx.qry.page = xstrdup(cmd + 1);
175 return; 175 return;
176 } 176 }
177} 177}
diff --git a/shared.c b/shared.c
index f063894..6c1a762 100644
--- a/shared.c
+++ b/shared.c
@@ -10,6 +10,7 @@
10 10
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13struct cgit_context ctx;
13int cgit_cmd; 14int cgit_cmd;
14 15
15const char *cgit_version = CGIT_VERSION; 16const char *cgit_version = CGIT_VERSION;
@@ -49,24 +50,8 @@ int cgit_max_msg_len = 60;
49int cgit_max_repodesc_len = 60; 50int cgit_max_repodesc_len = 60;
50int cgit_max_commit_count = 50; 51int cgit_max_commit_count = 50;
51 52
52int cgit_query_has_symref = 0;
53int cgit_query_has_sha1 = 0;
54
55char *cgit_querystring = NULL;
56char *cgit_query_repo = NULL;
57char *cgit_query_page = NULL;
58char *cgit_query_head = NULL;
59char *cgit_query_search = NULL;
60char *cgit_query_grep = NULL;
61char *cgit_query_sha1 = NULL;
62char *cgit_query_sha2 = NULL;
63char *cgit_query_path = NULL;
64char *cgit_query_name = NULL;
65int cgit_query_ofs = 0;
66
67int htmlfd = 0; 53int htmlfd = 0;
68 54
69
70int cgit_get_cmd_index(const char *cmd) 55int cgit_get_cmd_index(const char *cmd)
71{ 56{
72 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 57 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
@@ -239,32 +224,32 @@ void cgit_global_config_cb(const char *name, const char *value)
239void cgit_querystring_cb(const char *name, const char *value) 224void cgit_querystring_cb(const char *name, const char *value)
240{ 225{
241 if (!strcmp(name,"r")) { 226 if (!strcmp(name,"r")) {
242 cgit_query_repo = xstrdup(value); 227 ctx.qry.repo = xstrdup(value);
243 cgit_repo = cgit_get_repoinfo(value); 228 cgit_repo = cgit_get_repoinfo(value);
244 } else if (!strcmp(name, "p")) { 229 } else if (!strcmp(name, "p")) {
245 cgit_query_page = xstrdup(value); 230 ctx.qry.page = xstrdup(value);
246 cgit_cmd = cgit_get_cmd_index(value); 231 cgit_cmd = cgit_get_cmd_index(value);
247 } else if (!strcmp(name, "url")) { 232 } else if (!strcmp(name, "url")) {
248 cgit_parse_url(value); 233 cgit_parse_url(value);
249 } else if (!strcmp(name, "qt")) { 234 } else if (!strcmp(name, "qt")) {
250 cgit_query_grep = xstrdup(value); 235 ctx.qry.grep = xstrdup(value);
251 } else if (!strcmp(name, "q")) { 236 } else if (!strcmp(name, "q")) {
252 cgit_query_search = xstrdup(value); 237 ctx.qry.search = xstrdup(value);
253 } else if (!strcmp(name, "h")) { 238 } else if (!strcmp(name, "h")) {
254 cgit_query_head = xstrdup(value); 239 ctx.qry.head = xstrdup(value);
255 cgit_query_has_symref = 1; 240 ctx.qry.has_symref = 1;
256 } else if (!strcmp(name, "id")) { 241 } else if (!strcmp(name, "id")) {
257 cgit_query_sha1 = xstrdup(value); 242 ctx.qry.sha1 = xstrdup(value);
258 cgit_query_has_sha1 = 1; 243 ctx.qry.has_sha1 = 1;
259 } else if (!strcmp(name, "id2")) { 244 } else if (!strcmp(name, "id2")) {
260 cgit_query_sha2 = xstrdup(value); 245 ctx.qry.sha2 = xstrdup(value);
261 cgit_query_has_sha1 = 1; 246 ctx.qry.has_sha1 = 1;
262 } else if (!strcmp(name, "ofs")) { 247 } else if (!strcmp(name, "ofs")) {
263 cgit_query_ofs = atoi(value); 248 ctx.qry.ofs = atoi(value);
264 } else if (!strcmp(name, "path")) { 249 } else if (!strcmp(name, "path")) {
265 cgit_query_path = trim_end(value, '/'); 250 ctx.qry.path = trim_end(value, '/');
266 } else if (!strcmp(name, "name")) { 251 } else if (!strcmp(name, "name")) {
267 cgit_query_name = xstrdup(value); 252 ctx.qry.name = xstrdup(value);
268 } 253 }
269} 254}
270 255
diff --git a/ui-commit.c b/ui-commit.c
index bd55a33..3b0919b 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,7 +75,7 @@ void print_fileinfo(struct fileinfo *info)
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, 78 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
79 NULL, info->new_path); 79 NULL, info->new_path);
80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
81 htmlf(" (%s from %s)", 81 htmlf(" (%s from %s)",
@@ -143,7 +143,7 @@ void cgit_print_commit(char *hex)
143 int i; 143 int i;
144 144
145 if (!hex) 145 if (!hex)
146 hex = cgit_query_head; 146 hex = ctx.qry.head;
147 curr_rev = hex; 147 curr_rev = hex;
148 148
149 if (get_sha1(hex, sha1)) { 149 if (get_sha1(hex, sha1)) {
@@ -175,7 +175,7 @@ void cgit_print_commit(char *hex)
175 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 175 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
176 tmp = xstrdup(hex); 176 tmp = xstrdup(hex);
177 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 177 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
178 cgit_query_head, tmp, NULL); 178 ctx.qry.head, tmp, NULL);
179 html("</td></tr>\n"); 179 html("</td></tr>\n");
180 for (p = commit->parents; p ; p = p->next) { 180 for (p = commit->parents; p ; p = p->next) {
181 parent = lookup_commit_reference(p->item->object.sha1); 181 parent = lookup_commit_reference(p->item->object.sha1);
@@ -188,15 +188,15 @@ void cgit_print_commit(char *hex)
188 html("<tr><th>parent</th>" 188 html("<tr><th>parent</th>"
189 "<td colspan='2' class='sha1'>"); 189 "<td colspan='2' class='sha1'>");
190 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, 190 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
191 cgit_query_head, sha1_to_hex(p->item->object.sha1)); 191 ctx.qry.head, sha1_to_hex(p->item->object.sha1));
192 html(" ("); 192 html(" (");
193 cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, 193 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
194 sha1_to_hex(p->item->object.sha1), NULL); 194 sha1_to_hex(p->item->object.sha1), NULL);
195 html(")</td></tr>"); 195 html(")</td></tr>");
196 } 196 }
197 if (cgit_repo->snapshots) { 197 if (cgit_repo->snapshots) {
198 html("<tr><th>download</th><td colspan='2' class='sha1'>"); 198 html("<tr><th>download</th><td colspan='2' class='sha1'>");
199 cgit_print_snapshot_links(cgit_query_repo, cgit_query_head, 199 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
200 hex, cgit_repo->snapshots); 200 hex, cgit_repo->snapshots);
201 html("</td></tr>"); 201 html("</td></tr>");
202 } 202 }
@@ -218,7 +218,7 @@ void cgit_print_commit(char *hex)
218 html("<div class='diffstat-summary'>"); 218 html("<div class='diffstat-summary'>");
219 htmlf("%d files changed, %d insertions, %d deletions (", 219 htmlf("%d files changed, %d insertions, %d deletions (",
220 files, total_adds, total_rems); 220 files, total_adds, total_rems);
221 cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, 221 cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
222 NULL, NULL); 222 NULL, NULL);
223 html(")</div>"); 223 html(")</div>");
224 } 224 }
diff --git a/ui-diff.c b/ui-diff.c
index 4fcf852..263a7ba 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -71,13 +71,13 @@ static void header(unsigned char *sha1, char *path1, int mode1,
71 } 71 }
72 html("<br/>--- a/"); 72 html("<br/>--- a/");
73 if (mode1 != 0) 73 if (mode1 != 0)
74 cgit_tree_link(path1, NULL, NULL, cgit_query_head, 74 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
75 sha1_to_hex(old_rev_sha1), path1); 75 sha1_to_hex(old_rev_sha1), path1);
76 else 76 else
77 html_txt(path1); 77 html_txt(path1);
78 html("<br/>+++ b/"); 78 html("<br/>+++ b/");
79 if (mode2 != 0) 79 if (mode2 != 0)
80 cgit_tree_link(path2, NULL, NULL, cgit_query_head, 80 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
81 sha1_to_hex(new_rev_sha1), path2); 81 sha1_to_hex(new_rev_sha1), path2);
82 else 82 else
83 html_txt(path2); 83 html_txt(path2);
@@ -107,7 +107,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
107 struct commit *commit, *commit2; 107 struct commit *commit, *commit2;
108 108
109 if (!new_rev) 109 if (!new_rev)
110 new_rev = cgit_query_head; 110 new_rev = ctx.qry.head;
111 get_sha1(new_rev, new_rev_sha1); 111 get_sha1(new_rev, new_rev_sha1);
112 type = sha1_object_info(new_rev_sha1, &size); 112 type = sha1_object_info(new_rev_sha1, &size);
113 if (type == OBJ_BAD) { 113 if (type == OBJ_BAD) {
diff --git a/ui-log.c b/ui-log.c
index a41d2b2..a39474b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -37,7 +37,7 @@ void print_commit(struct commit *commit)
37 html("<tr><td>"); 37 html("<tr><td>");
38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
39 html("</td><td>"); 39 html("</td><td>");
40 cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, 40 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
41 sha1_to_hex(commit->object.sha1)); 41 sha1_to_hex(commit->object.sha1));
42 if (cgit_repo->enable_log_filecount) { 42 if (cgit_repo->enable_log_filecount) {
43 files = 0; 43 files = 0;
@@ -67,7 +67,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
67 int i; 67 int i;
68 68
69 if (!tip) 69 if (!tip)
70 argv[1] = cgit_query_head; 70 argv[1] = ctx.qry.head;
71 71
72 if (grep && pattern && (!strcmp(grep, "grep") || 72 if (grep && pattern && (!strcmp(grep, "grep") ||
73 !strcmp(grep, "author") || 73 !strcmp(grep, "author") ||
@@ -123,17 +123,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
123 if (pager) { 123 if (pager) {
124 html("<div class='pager'>"); 124 html("<div class='pager'>");
125 if (ofs > 0) { 125 if (ofs > 0) {
126 cgit_log_link("[prev]", NULL, NULL, cgit_query_head, 126 cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
127 cgit_query_sha1, cgit_query_path, 127 ctx.qry.sha1, ctx.qry.path,
128 ofs - cnt, cgit_query_grep, 128 ofs - cnt, ctx.qry.grep,
129 cgit_query_search); 129 ctx.qry.search);
130 html("&nbsp;"); 130 html("&nbsp;");
131 } 131 }
132 if ((commit = get_revision(&rev)) != NULL) { 132 if ((commit = get_revision(&rev)) != NULL) {
133 cgit_log_link("[next]", NULL, NULL, cgit_query_head, 133 cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
134 cgit_query_sha1, cgit_query_path, 134 ctx.qry.sha1, ctx.qry.path,
135 ofs + cnt, cgit_query_grep, 135 ofs + cnt, ctx.qry.grep,
136 cgit_query_search); 136 ctx.qry.search);
137 } 137 }
138 html("</div>"); 138 html("</div>");
139 } 139 }
diff --git a/ui-patch.c b/ui-patch.c
index e7a010a..1da0a27 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -76,7 +76,7 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
76 char *patchname; 76 char *patchname;
77 77
78 if (!hex) 78 if (!hex)
79 hex = cgit_query_head; 79 hex = ctx.qry.head;
80 80
81 if (get_sha1(hex, sha1)) { 81 if (get_sha1(hex, sha1)) {
82 cgit_print_error(fmt("Bad object id: %s", hex)); 82 cgit_print_error(fmt("Bad object id: %s", hex));
diff --git a/ui-refs.c b/ui-refs.c
index 295f5ba..ba513c1 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -16,9 +16,9 @@ void cgit_print_refs()
16 16
17 html("<table class='list nowrap'>"); 17 html("<table class='list nowrap'>");
18 18
19 if (cgit_query_path && !strncmp(cgit_query_path, "heads", 5)) 19 if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
20 cgit_print_branches(0); 20 cgit_print_branches(0);
21 else if (cgit_query_path && !strncmp(cgit_query_path, "tags", 4)) 21 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
22 cgit_print_tags(0); 22 cgit_print_tags(0);
23 else { 23 else {
24 cgit_print_branches(0); 24 cgit_print_branches(0);
diff --git a/ui-shared.c b/ui-shared.c
index 60aa2e3..6a41fb0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -112,10 +112,10 @@ char *cgit_currurl()
112{ 112{
113 if (!cgit_virtual_root) 113 if (!cgit_virtual_root)
114 return cgit_script_name; 114 return cgit_script_name;
115 else if (cgit_query_page) 115 else if (ctx.qry.page)
116 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); 116 return fmt("%s/%s/%s/", cgit_virtual_root, ctx.qry.repo, ctx.qry.page);
117 else if (cgit_query_repo) 117 else if (ctx.qry.repo)
118 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); 118 return fmt("%s/%s/", cgit_virtual_root, ctx.qry.repo);
119 else 119 else
120 return fmt("%s/", cgit_virtual_root); 120 return fmt("%s/", cgit_virtual_root);
121} 121}
@@ -179,7 +179,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
179 char *delim; 179 char *delim;
180 180
181 delim = repolink(title, class, page, head, path); 181 delim = repolink(title, class, page, head, path);
182 if (rev && strcmp(rev, cgit_query_head)) { 182 if (rev && strcmp(rev, ctx.qry.head)) {
183 html(delim); 183 html(delim);
184 html("id="); 184 html("id=");
185 html_attr(rev); 185 html_attr(rev);
@@ -201,7 +201,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
201 char *delim; 201 char *delim;
202 202