|
diff --git a/cgit.c b/cgit.c index 142e416..9ca93a7 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -14,128 +14,133 @@ static int cgit_prepare_cache(struct cacheitem *item) |
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", cgit_query_repo)); |
18 | cgit_print_docend(); |
18 | cgit_print_docend(); |
19 | return 0; |
19 | return 0; |
20 | } |
20 | } |
21 | |
21 | |
22 | if (!cgit_repo) { |
22 | if (!cgit_repo) { |
23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
24 | item->ttl = cgit_cache_root_ttl; |
24 | item->ttl = cgit_cache_root_ttl; |
25 | return 1; |
25 | return 1; |
26 | } |
26 | } |
27 | |
27 | |
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(cgit_querystring))); |
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 | cgit_query_page, |
37 | cache_safe_filename(cgit_querystring))); |
37 | cache_safe_filename(cgit_querystring))); |
38 | if (cgit_query_has_symref) |
38 | if (cgit_query_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 (cgit_query_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; |
44 | } |
44 | } |
45 | return 1; |
45 | return 1; |
46 | } |
46 | } |
47 | |
47 | |
48 | static void cgit_print_repo_page(struct cacheitem *item) |
48 | static void cgit_print_repo_page(struct cacheitem *item) |
49 | { |
49 | { |
50 | char *title; |
50 | char *title; |
51 | int show_search; |
51 | int show_search; |
52 | |
52 | |
53 | if (!cgit_query_head) |
53 | if (!cgit_query_head) |
54 | cgit_query_head = cgit_repo->defbranch; |
54 | cgit_query_head = cgit_repo->defbranch; |
55 | |
55 | |
56 | if (chdir(cgit_repo->path)) { |
56 | if (chdir(cgit_repo->path)) { |
57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
58 | cgit_print_docstart(title, item); |
58 | cgit_print_docstart(title, item); |
59 | cgit_print_pageheader(title, 0); |
59 | cgit_print_pageheader(title, 0); |
60 | cgit_print_error(fmt("Unable to scan repository: %s", |
60 | cgit_print_error(fmt("Unable to scan repository: %s", |
61 | strerror(errno))); |
61 | strerror(errno))); |
62 | cgit_print_docend(); |
62 | cgit_print_docend(); |
63 | return; |
63 | return; |
64 | } |
64 | } |
65 | |
65 | |
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
67 | show_search = 0; |
67 | show_search = 0; |
68 | setenv("GIT_DIR", cgit_repo->path, 1); |
68 | setenv("GIT_DIR", cgit_repo->path, 1); |
69 | |
69 | |
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
72 | cgit_repobasename(cgit_repo->url), |
72 | cgit_repobasename(cgit_repo->url), |
73 | cgit_query_path, |
73 | cgit_query_path, |
74 | cgit_repo->snapshots ); |
74 | cgit_repo->snapshots ); |
75 | return; |
75 | return; |
76 | } |
76 | } |
77 | |
77 | |
| |
78 | if (cgit_cmd == CMD_PATCH) { |
| |
79 | cgit_print_patch(cgit_query_sha1, item); |
| |
80 | return; |
| |
81 | } |
| |
82 | |
78 | if (cgit_cmd == CMD_BLOB) { |
83 | if (cgit_cmd == CMD_BLOB) { |
79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
84 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
80 | return; |
85 | return; |
81 | } |
86 | } |
82 | |
87 | |
83 | show_search = (cgit_cmd == CMD_LOG); |
88 | show_search = (cgit_cmd == CMD_LOG); |
84 | cgit_print_docstart(title, item); |
89 | cgit_print_docstart(title, item); |
85 | if (!cgit_cmd) { |
90 | if (!cgit_cmd) { |
86 | cgit_print_pageheader("summary", show_search); |
91 | cgit_print_pageheader("summary", show_search); |
87 | cgit_print_summary(); |
92 | cgit_print_summary(); |
88 | cgit_print_docend(); |
93 | cgit_print_docend(); |
89 | return; |
94 | return; |
90 | } |
95 | } |
91 | |
96 | |
92 | cgit_print_pageheader(cgit_query_page, show_search); |
97 | cgit_print_pageheader(cgit_query_page, show_search); |
93 | |
98 | |
94 | switch(cgit_cmd) { |
99 | switch(cgit_cmd) { |
95 | case CMD_LOG: |
100 | case CMD_LOG: |
96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
101 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
97 | cgit_max_commit_count, cgit_query_grep, cgit_query_search, |
102 | cgit_max_commit_count, cgit_query_grep, cgit_query_search, |
98 | cgit_query_path, 1); |
103 | cgit_query_path, 1); |
99 | break; |
104 | break; |
100 | case CMD_TREE: |
105 | case CMD_TREE: |
101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
106 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
102 | break; |
107 | break; |
103 | case CMD_COMMIT: |
108 | case CMD_COMMIT: |
104 | cgit_print_commit(cgit_query_sha1); |
109 | cgit_print_commit(cgit_query_sha1); |
105 | break; |
110 | break; |
106 | case CMD_REFS: |
111 | case CMD_REFS: |
107 | cgit_print_refs(); |
112 | cgit_print_refs(); |
108 | break; |
113 | break; |
109 | case CMD_TAG: |
114 | case CMD_TAG: |
110 | cgit_print_tag(cgit_query_sha1); |
115 | cgit_print_tag(cgit_query_sha1); |
111 | break; |
116 | break; |
112 | case CMD_DIFF: |
117 | case CMD_DIFF: |
113 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
118 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
114 | break; |
119 | break; |
115 | default: |
120 | default: |
116 | cgit_print_error("Invalid request"); |
121 | cgit_print_error("Invalid request"); |
117 | } |
122 | } |
118 | cgit_print_docend(); |
123 | cgit_print_docend(); |
119 | } |
124 | } |
120 | |
125 | |
121 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
126 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
122 | { |
127 | { |
123 | static char buf[PATH_MAX]; |
128 | static char buf[PATH_MAX]; |
124 | int stdout2; |
129 | int stdout2; |
125 | |
130 | |
126 | getcwd(buf, sizeof(buf)); |
131 | getcwd(buf, sizeof(buf)); |
127 | item->st.st_mtime = time(NULL); |
132 | item->st.st_mtime = time(NULL); |
128 | |
133 | |
129 | if (use_cache) { |
134 | if (use_cache) { |
130 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
135 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
131 | "Preserving STDOUT"); |
136 | "Preserving STDOUT"); |
132 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
137 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
133 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
138 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
134 | } |
139 | } |
135 | |
140 | |
136 | if (cgit_repo) |
141 | if (cgit_repo) |
137 | cgit_print_repo_page(item); |
142 | cgit_print_repo_page(item); |
138 | else |
143 | else |
139 | cgit_print_repolist(item); |
144 | cgit_print_repolist(item); |
140 | |
145 | |
141 | if (use_cache) { |
146 | if (use_cache) { |
|