|
diff --git a/cgit.c b/cgit.c index 9305d0a..2c3ad73 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -403,48 +403,54 @@ static int prepare_repo_cmd(struct cgit_context *ctx) |
403 | cgit_print_pageheader(ctx); |
403 | cgit_print_pageheader(ctx); |
404 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
404 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
405 | cgit_print_docend(); |
405 | cgit_print_docend(); |
406 | return 1; |
406 | return 1; |
407 | } |
407 | } |
408 | return 0; |
408 | return 0; |
409 | } |
409 | } |
410 | |
410 | |
411 | static void process_request(void *cbdata) |
411 | static void process_request(void *cbdata) |
412 | { |
412 | { |
413 | struct cgit_context *ctx = cbdata; |
413 | struct cgit_context *ctx = cbdata; |
414 | struct cgit_cmd *cmd; |
414 | struct cgit_cmd *cmd; |
415 | |
415 | |
416 | cmd = cgit_get_cmd(ctx); |
416 | cmd = cgit_get_cmd(ctx); |
417 | if (!cmd) { |
417 | if (!cmd) { |
418 | ctx->page.title = "cgit error"; |
418 | ctx->page.title = "cgit error"; |
419 | cgit_print_http_headers(ctx); |
419 | cgit_print_http_headers(ctx); |
420 | cgit_print_docstart(ctx); |
420 | cgit_print_docstart(ctx); |
421 | cgit_print_pageheader(ctx); |
421 | cgit_print_pageheader(ctx); |
422 | cgit_print_error("Invalid request"); |
422 | cgit_print_error("Invalid request"); |
423 | cgit_print_docend(); |
423 | cgit_print_docend(); |
424 | return; |
424 | return; |
425 | } |
425 | } |
426 | |
426 | |
| |
427 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" |
| |
428 | * in-project path limit to be made available at ctx->qry.vpath. |
| |
429 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). |
| |
430 | */ |
| |
431 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; |
| |
432 | |
427 | if (cmd->want_repo && !ctx->repo) { |
433 | if (cmd->want_repo && !ctx->repo) { |
428 | cgit_print_http_headers(ctx); |
434 | cgit_print_http_headers(ctx); |
429 | cgit_print_docstart(ctx); |
435 | cgit_print_docstart(ctx); |
430 | cgit_print_pageheader(ctx); |
436 | cgit_print_pageheader(ctx); |
431 | cgit_print_error(fmt("No repository selected")); |
437 | cgit_print_error(fmt("No repository selected")); |
432 | cgit_print_docend(); |
438 | cgit_print_docend(); |
433 | return; |
439 | return; |
434 | } |
440 | } |
435 | |
441 | |
436 | if (ctx->repo && prepare_repo_cmd(ctx)) |
442 | if (ctx->repo && prepare_repo_cmd(ctx)) |
437 | return; |
443 | return; |
438 | |
444 | |
439 | if (cmd->want_layout) { |
445 | if (cmd->want_layout) { |
440 | cgit_print_http_headers(ctx); |
446 | cgit_print_http_headers(ctx); |
441 | cgit_print_docstart(ctx); |
447 | cgit_print_docstart(ctx); |
442 | cgit_print_pageheader(ctx); |
448 | cgit_print_pageheader(ctx); |
443 | } |
449 | } |
444 | |
450 | |
445 | cmd->fn(ctx); |
451 | cmd->fn(ctx); |
446 | |
452 | |
447 | if (cmd->want_layout) |
453 | if (cmd->want_layout) |
448 | cgit_print_docend(); |
454 | cgit_print_docend(); |
449 | } |
455 | } |
450 | |
456 | |
|
|
diff --git a/cgit.h b/cgit.h index cd4af72..f990b15 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -124,48 +124,49 @@ struct reflist { |
124 | int count; |
124 | int count; |
125 | }; |
125 | }; |
126 | |
126 | |
127 | struct cgit_query { |
127 | struct cgit_query { |
128 | int has_symref; |
128 | int has_symref; |
129 | int has_sha1; |
129 | int has_sha1; |
130 | char *raw; |
130 | char *raw; |
131 | char *repo; |
131 | char *repo; |
132 | char *page; |
132 | char *page; |
133 | char *search; |
133 | char *search; |
134 | char *grep; |
134 | char *grep; |
135 | char *head; |
135 | char *head; |
136 | char *sha1; |
136 | char *sha1; |
137 | char *sha2; |
137 | char *sha2; |
138 | char *path; |
138 | char *path; |
139 | char *name; |
139 | char *name; |
140 | char *mimetype; |
140 | char *mimetype; |
141 | char *url; |
141 | char *url; |
142 | char *period; |
142 | char *period; |
143 | int ofs; |
143 | int ofs; |
144 | int nohead; |
144 | int nohead; |
145 | char *sort; |
145 | char *sort; |
146 | int showmsg; |
146 | int showmsg; |
147 | int ssdiff; |
147 | int ssdiff; |
| |
148 | char *vpath; |
148 | }; |
149 | }; |
149 | |
150 | |
150 | struct cgit_config { |
151 | struct cgit_config { |
151 | char *agefile; |
152 | char *agefile; |
152 | char *cache_root; |
153 | char *cache_root; |
153 | char *clone_prefix; |
154 | char *clone_prefix; |
154 | char *css; |
155 | char *css; |
155 | char *favicon; |
156 | char *favicon; |
156 | char *footer; |
157 | char *footer; |
157 | char *head_include; |
158 | char *head_include; |
158 | char *header; |
159 | char *header; |
159 | char *index_header; |
160 | char *index_header; |
160 | char *index_info; |
161 | char *index_info; |
161 | char *logo; |
162 | char *logo; |
162 | char *logo_link; |
163 | char *logo_link; |
163 | char *module_link; |
164 | char *module_link; |
164 | char *robots; |
165 | char *robots; |
165 | char *root_title; |
166 | char *root_title; |
166 | char *root_desc; |
167 | char *root_desc; |
167 | char *root_readme; |
168 | char *root_readme; |
168 | char *script_name; |
169 | char *script_name; |
169 | char *section; |
170 | char *section; |
170 | char *virtual_root; |
171 | char *virtual_root; |
171 | int cache_size; |
172 | int cache_size; |
|
|
diff --git a/cmd.c b/cmd.c index 766f903..a9e426a 100644 --- a/ cmd.c+++ b/ cmd.c |
|
@@ -108,64 +108,64 @@ static void snapshot_fn(struct cgit_context *ctx) |
108 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, |
108 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, |
109 | ctx->repo->snapshots, ctx->qry.nohead); |
109 | ctx->repo->snapshots, ctx->qry.nohead); |
110 | } |
110 | } |
111 | |
111 | |
112 | static void stats_fn(struct cgit_context *ctx) |
112 | static void stats_fn(struct cgit_context *ctx) |
113 | { |
113 | { |
114 | cgit_show_stats(ctx); |
114 | cgit_show_stats(ctx); |
115 | } |
115 | } |
116 | |
116 | |
117 | static void summary_fn(struct cgit_context *ctx) |
117 | static void summary_fn(struct cgit_context *ctx) |
118 | { |
118 | { |
119 | cgit_print_summary(); |
119 | cgit_print_summary(); |
120 | } |
120 | } |
121 | |
121 | |
122 | static void tag_fn(struct cgit_context *ctx) |
122 | static void tag_fn(struct cgit_context *ctx) |
123 | { |
123 | { |
124 | cgit_print_tag(ctx->qry.sha1); |
124 | cgit_print_tag(ctx->qry.sha1); |
125 | } |
125 | } |
126 | |
126 | |
127 | static void tree_fn(struct cgit_context *ctx) |
127 | static void tree_fn(struct cgit_context *ctx) |
128 | { |
128 | { |
129 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
129 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
130 | } |
130 | } |
131 | |
131 | |
132 | #define def_cmd(name, want_repo, want_layout) \ |
132 | #define def_cmd(name, want_repo, want_layout, want_vpath) \ |
133 | {#name, name##_fn, want_repo, want_layout} |
133 | {#name, name##_fn, want_repo, want_layout, want_vpath} |
134 | |
134 | |
135 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
135 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
136 | { |
136 | { |
137 | static struct cgit_cmd cmds[] = { |
137 | static struct cgit_cmd cmds[] = { |
138 | def_cmd(HEAD, 1, 0), |
138 | def_cmd(HEAD, 1, 0, 0), |
139 | def_cmd(atom, 1, 0), |
139 | def_cmd(atom, 1, 0, 0), |
140 | def_cmd(about, 0, 1), |
140 | def_cmd(about, 0, 1, 0), |
141 | def_cmd(blob, 1, 0), |
141 | def_cmd(blob, 1, 0, 0), |
142 | def_cmd(commit, 1, 1), |
142 | def_cmd(commit, 1, 1, 1), |
143 | def_cmd(diff, 1, 1), |
143 | def_cmd(diff, 1, 1, 1), |
144 | def_cmd(info, 1, 0), |
144 | def_cmd(info, 1, 0, 0), |
145 | def_cmd(log, 1, 1), |
145 | def_cmd(log, 1, 1, 1), |
146 | def_cmd(ls_cache, 0, 0), |
146 | def_cmd(ls_cache, 0, 0, 0), |
147 | def_cmd(objects, 1, 0), |
147 | def_cmd(objects, 1, 0, 0), |
148 | def_cmd(patch, 1, 0), |
148 | def_cmd(patch, 1, 0, 1), |
149 | def_cmd(plain, 1, 0), |
149 | def_cmd(plain, 1, 0, 0), |
150 | def_cmd(refs, 1, 1), |
150 | def_cmd(refs, 1, 1, 0), |
151 | def_cmd(repolist, 0, 0), |
151 | def_cmd(repolist, 0, 0, 0), |
152 | def_cmd(snapshot, 1, 0), |
152 | def_cmd(snapshot, 1, 0, 0), |
153 | def_cmd(stats, 1, 1), |
153 | def_cmd(stats, 1, 1, 1), |
154 | def_cmd(summary, 1, 1), |
154 | def_cmd(summary, 1, 1, 0), |
155 | def_cmd(tag, 1, 1), |
155 | def_cmd(tag, 1, 1, 0), |
156 | def_cmd(tree, 1, 1), |
156 | def_cmd(tree, 1, 1, 1), |
157 | }; |
157 | }; |
158 | int i; |
158 | int i; |
159 | |
159 | |
160 | if (ctx->qry.page == NULL) { |
160 | if (ctx->qry.page == NULL) { |
161 | if (ctx->repo) |
161 | if (ctx->repo) |
162 | ctx->qry.page = "summary"; |
162 | ctx->qry.page = "summary"; |
163 | else |
163 | else |
164 | ctx->qry.page = "repolist"; |
164 | ctx->qry.page = "repolist"; |
165 | } |
165 | } |
166 | |
166 | |
167 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) |
167 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) |
168 | if (!strcmp(ctx->qry.page, cmds[i].name)) |
168 | if (!strcmp(ctx->qry.page, cmds[i].name)) |
169 | return &cmds[i]; |
169 | return &cmds[i]; |
170 | return NULL; |
170 | return NULL; |
171 | } |
171 | } |
|
|
diff --git a/cmd.h b/cmd.h index ec9e691..8dc01bd 100644 --- a/ cmd.h+++ b/ cmd.h |
|
@@ -1,15 +1,16 @@ |
1 | #ifndef CMD_H |
1 | #ifndef CMD_H |
2 | #define CMD_H |
2 | #define CMD_H |
3 | |
3 | |
4 | typedef void (*cgit_cmd_fn)(struct cgit_context *ctx); |
4 | typedef void (*cgit_cmd_fn)(struct cgit_context *ctx); |
5 | |
5 | |
6 | struct cgit_cmd { |
6 | struct cgit_cmd { |
7 | const char *name; |
7 | const char *name; |
8 | cgit_cmd_fn fn; |
8 | cgit_cmd_fn fn; |
9 | unsigned int want_repo:1, |
9 | unsigned int want_repo:1, |
10 | want_layout:1; |
10 | want_layout:1, |
| |
11 | want_vpath:1; |
11 | }; |
12 | }; |
12 | |
13 | |
13 | extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx); |
14 | extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx); |
14 | |
15 | |
15 | #endif /* CMD_H */ |
16 | #endif /* CMD_H */ |
|