-rw-r--r-- | cache.c | 4 | ||||
-rw-r--r-- | cgit.c | 72 | ||||
-rw-r--r-- | cgit.h | 35 | ||||
-rw-r--r-- | parsing.c | 8 | ||||
-rw-r--r-- | shared.c | 43 | ||||
-rw-r--r-- | ui-commit.c | 14 | ||||
-rw-r--r-- | ui-diff.c | 6 | ||||
-rw-r--r-- | ui-log.c | 20 | ||||
-rw-r--r-- | ui-patch.c | 2 | ||||
-rw-r--r-- | ui-refs.c | 4 | ||||
-rw-r--r-- | ui-shared.c | 86 | ||||
-rw-r--r-- | ui-summary.c | 6 | ||||
-rw-r--r-- | ui-tree.c | 20 |
13 files changed, 156 insertions, 164 deletions
@@ -59,6 +59,6 @@ int cache_create_dirs() | |||
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) |
@@ -12,3 +12,3 @@ static 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"); |
@@ -16,3 +16,3 @@ static int cgit_prepare_cache(struct cacheitem *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(); |
@@ -30,3 +30,3 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
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; |
@@ -35,7 +35,7 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
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; |
@@ -100,8 +100,8 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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); |
@@ -113,5 +113,5 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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); |
@@ -124,5 +124,5 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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 ); |
@@ -132,3 +132,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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; |
@@ -137,3 +137,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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; |
@@ -150,3 +150,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
150 | 150 | ||
151 | cgit_print_pageheader(cgit_query_page, show_search); | 151 | cgit_print_pageheader(ctx.qry.page, show_search); |
152 | 152 | ||
@@ -154,11 +154,11 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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; |
@@ -168,6 +168,6 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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; |
@@ -266,20 +266,20 @@ static void cgit_parse_args(int argc, const char **argv) | |||
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 | } |
@@ -305,5 +305,5 @@ int main(int argc, const char **argv) | |||
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)) |
@@ -125,2 +125,22 @@ struct reflist { | |||
125 | 125 | ||
126 | struct 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 | |||
142 | struct cgit_context { | ||
143 | struct cgit_query qry; | ||
144 | }; | ||
145 | |||
126 | extern const char *cgit_version; | 146 | extern const char *cgit_version; |
@@ -129,2 +149,3 @@ extern struct repolist cgit_repolist; | |||
129 | extern struct repoinfo *cgit_repo; | 149 | extern struct repoinfo *cgit_repo; |
150 | extern struct cgit_context ctx; | ||
130 | extern int cgit_cmd; | 151 | extern int cgit_cmd; |
@@ -165,16 +186,2 @@ extern int cgit_max_commit_count; | |||
165 | 186 | ||
166 | extern int cgit_query_has_symref; | ||
167 | extern int cgit_query_has_sha1; | ||
168 | |||
169 | extern char *cgit_querystring; | ||
170 | extern char *cgit_query_repo; | ||
171 | extern char *cgit_query_page; | ||
172 | extern char *cgit_query_search; | ||
173 | extern char *cgit_query_grep; | ||
174 | extern char *cgit_query_head; | ||
175 | extern char *cgit_query_sha1; | ||
176 | extern char *cgit_query_sha2; | ||
177 | extern char *cgit_query_path; | ||
178 | extern char *cgit_query_name; | ||
179 | extern int cgit_query_ofs; | ||
180 | 187 | ||
@@ -151,3 +151,3 @@ void cgit_parse_url(const char *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; |
@@ -165,3 +165,3 @@ void cgit_parse_url(const char *url) | |||
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, '/'); |
@@ -170,6 +170,6 @@ void cgit_parse_url(const char *url) | |||
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; |
@@ -12,2 +12,3 @@ struct repolist cgit_repolist; | |||
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | struct cgit_context ctx; | ||
13 | int cgit_cmd; | 14 | int cgit_cmd; |
@@ -51,20 +52,4 @@ int cgit_max_commit_count = 50; | |||
51 | 52 | ||
52 | int cgit_query_has_symref = 0; | ||
53 | int cgit_query_has_sha1 = 0; | ||
54 | |||
55 | char *cgit_querystring = NULL; | ||
56 | char *cgit_query_repo = NULL; | ||
57 | char *cgit_query_page = NULL; | ||
58 | char *cgit_query_head = NULL; | ||
59 | char *cgit_query_search = NULL; | ||
60 | char *cgit_query_grep = NULL; | ||
61 | char *cgit_query_sha1 = NULL; | ||
62 | char *cgit_query_sha2 = NULL; | ||
63 | char *cgit_query_path = NULL; | ||
64 | char *cgit_query_name = NULL; | ||
65 | int cgit_query_ofs = 0; | ||
66 | |||
67 | int htmlfd = 0; | 53 | int htmlfd = 0; |
68 | 54 | ||
69 | |||
70 | int cgit_get_cmd_index(const char *cmd) | 55 | int cgit_get_cmd_index(const char *cmd) |
@@ -241,6 +226,6 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
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); |
@@ -249,20 +234,20 @@ void cgit_querystring_cb(const char *name, const char *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 | } |
diff --git a/ui-commit.c b/ui-commit.c index bd55a33..3b0919b 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -77,3 +77,3 @@ void print_fileinfo(struct fileinfo *info) | |||
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); |
@@ -145,3 +145,3 @@ void cgit_print_commit(char *hex) | |||
145 | if (!hex) | 145 | if (!hex) |
146 | hex = cgit_query_head; | 146 | hex = ctx.qry.head; |
147 | curr_rev = hex; | 147 | curr_rev = hex; |
@@ -177,3 +177,3 @@ void cgit_print_commit(char *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"); |
@@ -190,5 +190,5 @@ void cgit_print_commit(char *hex) | |||
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); |
@@ -198,3 +198,3 @@ void cgit_print_commit(char *hex) | |||
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); |
@@ -220,3 +220,3 @@ void cgit_print_commit(char *hex) | |||
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); |
@@ -73,3 +73,3 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
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); |
@@ -79,3 +79,3 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
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); |
@@ -109,3 +109,3 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
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); |
@@ -39,3 +39,3 @@ void print_commit(struct commit *commit) | |||
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)); |
@@ -69,3 +69,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
69 | if (!tip) | 69 | if (!tip) |
70 | argv[1] = cgit_query_head; | 70 | argv[1] = ctx.qry.head; |
71 | 71 | ||
@@ -125,6 +125,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
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(" "); | 130 | html(" "); |
@@ -132,6 +132,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
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 | } |
@@ -78,3 +78,3 @@ void cgit_print_patch(char *hex, struct cacheitem *item) | |||
78 | if (!hex) | 78 | if (!hex) |
79 | hex = cgit_query_head; | 79 | hex = ctx.qry.head; |
80 | 80 | ||
@@ -18,5 +18,5 @@ void cgit_print_refs() | |||
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); |
diff --git a/ui-shared.c b/ui-shared.c index 60aa2e3..6a41fb0 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -114,6 +114,6 @@ char *cgit_currurl() | |||
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 |
@@ -181,3 +181,3 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
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); |
@@ -203,3 +203,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
203 | delim = repolink(title, class, "log", head, path); | 203 | delim = repolink(title, class, "log", head, path); |
204 | if (rev && strcmp(rev, cgit_query_head)) { | 204 | if (rev && strcmp(rev, ctx.qry.head)) { |
205 | html(delim); | 205 | html(delim); |
@@ -258,3 +258,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
258 | delim = repolink(title, class, "diff", head, path); | 258 | delim = repolink(title, class, "diff", head, path); |
259 | if (new_rev && strcmp(new_rev, cgit_query_head)) { | 259 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
260 | html(delim); | 260 | html(delim); |
@@ -286,3 +286,3 @@ void cgit_object_link(struct object *obj) | |||
286 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 286 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
287 | cgit_query_head, sha1_to_hex(obj->sha1)); | 287 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
288 | return; | 288 | return; |
@@ -299,3 +299,3 @@ void cgit_object_link(struct object *obj) | |||
299 | 299 | ||
300 | url = cgit_pageurl(cgit_query_repo, page, | 300 | url = cgit_pageurl(ctx.qry.repo, page, |
301 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 301 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
@@ -394,3 +394,3 @@ int print_branch_option(const char *refname, const unsigned char *sha1, | |||
394 | char *name = (char *)refname; | 394 | char *name = (char *)refname; |
395 | html_option(name, name, cgit_query_head); | 395 | html_option(name, name, ctx.qry.head); |
396 | return 0; | 396 | return 0; |
@@ -428,3 +428,3 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
428 | } | 428 | } |
429 | url = cgit_pageurl(cgit_query_repo, "blob", | 429 | url = cgit_pageurl(ctx.qry.repo, "blob", |
430 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 430 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
@@ -442,5 +442,5 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
442 | if (!cgit_virtual_root) { | 442 | if (!cgit_virtual_root) { |
443 | url = fmt("%s/%s", cgit_query_repo, page); | 443 | url = fmt("%s/%s", ctx.qry.repo, page); |
444 | if (cgit_query_path) | 444 | if (ctx.qry.path) |
445 | url = fmt("%s/%s", url, cgit_query_path); | 445 | url = fmt("%s/%s", url, ctx.qry.path); |
446 | html_hidden("url", url); | 446 | html_hidden("url", url); |
@@ -448,15 +448,15 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
448 | 448 | ||
449 | if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) | 449 | if (incl_head && strcmp(ctx.qry.head, cgit_repo->defbranch)) |
450 | html_hidden("h", cgit_query_head); | 450 | html_hidden("h", ctx.qry.head); |
451 | 451 | ||
452 | if (cgit_query_sha1) | 452 | if (ctx.qry.sha1) |
453 | html_hidden("id", cgit_query_sha1); | 453 | html_hidden("id", ctx.qry.sha1); |
454 | if (cgit_query_sha2) | 454 | if (ctx.qry.sha2) |
455 | html_hidden("id2", cgit_query_sha2); | 455 | html_hidden("id2", ctx.qry.sha2); |
456 | 456 | ||
457 | if (incl_search) { | 457 | if (incl_search) { |
458 | if (cgit_query_grep) | 458 | if (ctx.qry.grep) |
459 | html_hidden("qt", cgit_query_grep); | 459 | html_hidden("qt", ctx.qry.grep); |
460 | if (cgit_query_search) | 460 | if (ctx.qry.search) |
461 | html_hidden("q", cgit_query_search); | 461 | html_hidden("q", ctx.qry.search); |
462 | } | 462 | } |
@@ -478,3 +478,3 @@ void cgit_print_pageheader(char *title, int show_search) | |||
478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); | 478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
479 | if (cgit_query_repo) { | 479 | if (ctx.qry.repo) { |
480 | html("<h1 class='first'>"); | 480 | html("<h1 class='first'>"); |
@@ -488,14 +488,14 @@ void cgit_print_pageheader(char *title, int show_search) | |||
488 | html("<h1>navigate</h1>\n"); | 488 | html("<h1>navigate</h1>\n"); |
489 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 489 | reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head, |
490 | NULL, NULL); | 490 | NULL, NULL); |
491 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, | 491 | cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL, |
492 | 0, NULL, NULL); | 492 | 0, NULL, NULL); |
493 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, | 493 | cgit_tree_link("tree", NULL, "menu", ctx.qry.head, |
494 | cgit_query_sha1, NULL); | 494 | ctx.qry.sha1, NULL); |
495 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, | 495 | cgit_commit_link("commit", NULL, "menu", ctx.qry.head, |
496 | cgit_query_sha1); | 496 | ctx.qry.sha1); |
497 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, | 497 | cgit_diff_link("diff", NULL, "menu", ctx.qry.head, |
498 | cgit_query_sha1, cgit_query_sha2, NULL); | 498 | ctx.qry.sha1, ctx.qry.sha2, NULL); |
499 | cgit_patch_link("patch", NULL, "menu", cgit_query_head, | 499 | cgit_patch_link("patch", NULL, "menu", ctx.qry.head, |
500 | cgit_query_sha1); | 500 | ctx.qry.sha1); |
501 | 501 | ||
@@ -521,6 +521,6 @@ void cgit_print_pageheader(char *title, int show_search) | |||
521 | html("<form method='get' action=''>\n"); | 521 | html("<form method='get' action=''>\n"); |
522 | add_hidden_formfields(0, 1, cgit_query_page); | 522 | add_hidden_formfields(0, 1, ctx.qry.page); |
523 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); | 523 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
524 | html("<select name='h' onchange='this.form.submit();'>\n"); | 524 | html("<select name='h' onchange='this.form.submit();'>\n"); |
525 | for_each_branch_ref(print_branch_option, cgit_query_head); | 525 | for_each_branch_ref(print_branch_option, ctx.qry.head); |
526 | html("</select>\n"); | 526 | html("</select>\n"); |
@@ -534,4 +534,4 @@ void cgit_print_pageheader(char *title, int show_search) | |||
534 | if (cgit_virtual_root) | 534 | if (cgit_virtual_root) |
535 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 535 | html_attr(cgit_fileurl(ctx.qry.repo, "log", |
536 | cgit_query_path, NULL)); | 536 | ctx.qry.path, NULL)); |
537 | html("'>\n"); | 537 | html("'>\n"); |
@@ -539,8 +539,8 @@ void cgit_print_pageheader(char *title, int show_search) | |||
539 | html("<select name='qt'>\n"); | 539 | html("<select name='qt'>\n"); |
540 | html_option("grep", "log msg", cgit_query_grep); | 540 | html_option("grep", "log msg", ctx.qry.grep); |
541 | html_option("author", "author", cgit_query_grep); | 541 | html_option("author", "author", ctx.qry.grep); |
542 | html_option("committer", "committer", cgit_query_grep); | 542 | html_option("committer", "committer", ctx.qry.grep); |
543 | html("</select>\n"); | 543 | html("</select>\n"); |
544 | html("<input class='txt' type='text' name='q' value='"); | 544 | html("<input class='txt' type='text' name='q' value='"); |
545 | html_attr(cgit_query_search); | 545 | html_attr(ctx.qry.search); |
546 | html("'/>\n"); | 546 | html("'/>\n"); |
diff --git a/ui-summary.c b/ui-summary.c index b96414e..bbd4464 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -96,3 +96,3 @@ static int print_tag(struct refinfo *ref) | |||
96 | html("<tr><td>"); | 96 | html("<tr><td>"); |
97 | url = cgit_pageurl(cgit_query_repo, "tag", | 97 | url = cgit_pageurl(ctx.qry.repo, "tag", |
98 | fmt("id=%s", name)); | 98 | fmt("id=%s", name)); |
@@ -125,3 +125,3 @@ static void print_refs_link(char *path) | |||
125 | html("<tr class='nohover'><td colspan='4'>"); | 125 | html("<tr class='nohover'><td colspan='4'>"); |
126 | cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path); | 126 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
127 | html("</td></tr>"); | 127 | html("</td></tr>"); |
@@ -190,3 +190,3 @@ void cgit_print_summary() | |||
190 | if (cgit_summary_log > 0) | 190 | if (cgit_summary_log > 0) |
191 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, | 191 | cgit_print_log(ctx.qry.head, 0, cgit_summary_log, NULL, |
192 | NULL, NULL, 0); | 192 | NULL, NULL, 0); |
@@ -36,3 +36,3 @@ static void print_object(const unsigned char *sha1, char *path) | |||
36 | html(" blob: <a href='"); | 36 | html(" blob: <a href='"); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); | 37 | html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); | 38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
@@ -69,4 +69,4 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
69 | name = xstrdup(pathname); | 69 | name = xstrdup(pathname); |
70 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", | 70 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
71 | cgit_query_path ? "/" : "", name); | 71 | ctx.qry.path ? "/" : "", name); |
72 | 72 | ||
@@ -92,6 +92,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
92 | } else if (S_ISDIR(mode)) { | 92 | } else if (S_ISDIR(mode)) { |
93 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, | 93 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
94 | curr_rev, fullpath); | 94 | curr_rev, fullpath); |
95 | } else { | 95 | } else { |
96 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, | 96 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
97 | curr_rev, fullpath); | 97 | curr_rev, fullpath); |
@@ -101,3 +101,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
101 | html("<td>"); | 101 | html("<td>"); |
102 | cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev, | 102 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
103 | fullpath, 0, NULL, NULL); | 103 | fullpath, 0, NULL, NULL); |
@@ -155,6 +155,6 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
155 | strcpy(buffer+baselen, pathname); | 155 | strcpy(buffer+baselen, pathname); |
156 | url = cgit_pageurl(cgit_query_repo, "tree", | 156 | url = cgit_pageurl(ctx.qry.repo, "tree", |
157 | fmt("h=%s&path=%s", curr_rev, buffer)); | 157 | fmt("h=%s&path=%s", curr_rev, buffer)); |
158 | html("/"); | 158 | html("/"); |
159 | cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head, | 159 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, |
160 | curr_rev, buffer); | 160 | curr_rev, buffer); |
@@ -190,3 +190,3 @@ void cgit_print_tree(const char *rev, char *path) | |||
190 | if (!rev) | 190 | if (!rev) |
191 | rev = cgit_query_head; | 191 | rev = ctx.qry.head; |
192 | 192 | ||
@@ -204,3 +204,3 @@ void cgit_print_tree(const char *rev, char *path) | |||
204 | html("path: <a href='"); | 204 | html("path: <a href='"); |
205 | html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev))); | 205 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); |
206 | html("'>root</a>"); | 206 | html("'>root</a>"); |