|
diff --git a/cgit.c b/cgit.c index d0f6905..a83f0be 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -60,49 +60,49 @@ int find_current_ref(const char *refname, const unsigned char *sha1, |
60 | struct refmatch *info; |
60 | struct refmatch *info; |
61 | |
61 | |
62 | info = (struct refmatch *)cb_data; |
62 | info = (struct refmatch *)cb_data; |
63 | if (!strcmp(refname, info->req_ref)) |
63 | if (!strcmp(refname, info->req_ref)) |
64 | info->match = 1; |
64 | info->match = 1; |
65 | if (!info->first_ref) |
65 | if (!info->first_ref) |
66 | info->first_ref = xstrdup(refname); |
66 | info->first_ref = xstrdup(refname); |
67 | return info->match; |
67 | return info->match; |
68 | } |
68 | } |
69 | |
69 | |
70 | char *find_default_branch(struct cgit_repo *repo) |
70 | char *find_default_branch(struct cgit_repo *repo) |
71 | { |
71 | { |
72 | struct refmatch info; |
72 | struct refmatch info; |
73 | |
73 | |
74 | info.req_ref = repo->defbranch; |
74 | info.req_ref = repo->defbranch; |
75 | info.first_ref = NULL; |
75 | info.first_ref = NULL; |
76 | info.match = 0; |
76 | info.match = 0; |
77 | for_each_branch_ref(find_current_ref, &info); |
77 | for_each_branch_ref(find_current_ref, &info); |
78 | if (info.match) |
78 | if (info.match) |
79 | return info.req_ref; |
79 | return info.req_ref; |
80 | else |
80 | else |
81 | return info.first_ref; |
81 | return info.first_ref; |
82 | } |
82 | } |
83 | |
83 | |
84 | static void cgit_print_repo_page(struct cacheitem *item) |
84 | static void cgit_print_repo_page() |
85 | { |
85 | { |
86 | char *tmp; |
86 | char *tmp; |
87 | int show_search; |
87 | int show_search; |
88 | unsigned char sha1[20]; |
88 | unsigned char sha1[20]; |
89 | int nongit = 0; |
89 | int nongit = 0; |
90 | |
90 | |
91 | setenv("GIT_DIR", ctx.repo->path, 1); |
91 | setenv("GIT_DIR", ctx.repo->path, 1); |
92 | setup_git_directory_gently(&nongit); |
92 | setup_git_directory_gently(&nongit); |
93 | if (nongit) { |
93 | if (nongit) { |
94 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, |
94 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, |
95 | "config error"); |
95 | "config error"); |
96 | tmp = fmt("Not a git repository: '%s'", ctx.repo->path); |
96 | tmp = fmt("Not a git repository: '%s'", ctx.repo->path); |
97 | ctx.repo = NULL; |
97 | ctx.repo = NULL; |
98 | cgit_print_http_headers(&ctx); |
98 | cgit_print_http_headers(&ctx); |
99 | cgit_print_docstart(&ctx); |
99 | cgit_print_docstart(&ctx); |
100 | cgit_print_pageheader(&ctx); |
100 | cgit_print_pageheader(&ctx); |
101 | cgit_print_error(tmp); |
101 | cgit_print_error(tmp); |
102 | cgit_print_docend(); |
102 | cgit_print_docend(); |
103 | return; |
103 | return; |
104 | } |
104 | } |
105 | |
105 | |
106 | ctx.page.title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc); |
106 | ctx.page.title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc); |
107 | show_search = 0; |
107 | show_search = 0; |
108 | |
108 | |
@@ -111,62 +111,62 @@ static void cgit_print_repo_page(struct cacheitem *item) |
111 | ctx.repo->defbranch = ctx.qry.head; |
111 | ctx.repo->defbranch = ctx.qry.head; |
112 | } |
112 | } |
113 | |
113 | |
114 | if (!ctx.qry.head) { |
114 | if (!ctx.qry.head) { |
115 | cgit_print_http_headers(&ctx); |
115 | cgit_print_http_headers(&ctx); |
116 | cgit_print_docstart(&ctx); |
116 | cgit_print_docstart(&ctx); |
117 | cgit_print_pageheader(&ctx); |
117 | cgit_print_pageheader(&ctx); |
118 | cgit_print_error("Repository seems to be empty"); |
118 | cgit_print_error("Repository seems to be empty"); |
119 | cgit_print_docend(); |
119 | cgit_print_docend(); |
120 | return; |
120 | return; |
121 | } |
121 | } |
122 | |
122 | |
123 | if (get_sha1(ctx.qry.head, sha1)) { |
123 | if (get_sha1(ctx.qry.head, sha1)) { |
124 | tmp = xstrdup(ctx.qry.head); |
124 | tmp = xstrdup(ctx.qry.head); |
125 | ctx.qry.head = ctx.repo->defbranch; |
125 | ctx.qry.head = ctx.repo->defbranch; |
126 | cgit_print_http_headers(&ctx); |
126 | cgit_print_http_headers(&ctx); |
127 | cgit_print_docstart(&ctx); |
127 | cgit_print_docstart(&ctx); |
128 | cgit_print_pageheader(&ctx); |
128 | cgit_print_pageheader(&ctx); |
129 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
129 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
130 | cgit_print_docend(); |
130 | cgit_print_docend(); |
131 | return; |
131 | return; |
132 | } |
132 | } |
133 | |
133 | |
134 | if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) { |
134 | if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) { |
135 | cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1, |
135 | cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, |
136 | cgit_repobasename(ctx.repo->url), |
136 | cgit_repobasename(ctx.repo->url), |
137 | ctx.qry.path, |
137 | ctx.qry.path, |
138 | ctx.repo->snapshots ); |
138 | ctx.repo->snapshots ); |
139 | return; |
139 | return; |
140 | } |
140 | } |
141 | |
141 | |
142 | if (cgit_cmd == CMD_PATCH) { |
142 | if (cgit_cmd == CMD_PATCH) { |
143 | cgit_print_patch(ctx.qry.sha1, item); |
143 | cgit_print_patch(ctx.qry.sha1); |
144 | return; |
144 | return; |
145 | } |
145 | } |
146 | |
146 | |
147 | if (cgit_cmd == CMD_BLOB) { |
147 | if (cgit_cmd == CMD_BLOB) { |
148 | cgit_print_blob(item, ctx.qry.sha1, ctx.qry.path); |
148 | cgit_print_blob(ctx.qry.sha1, ctx.qry.path); |
149 | return; |
149 | return; |
150 | } |
150 | } |
151 | |
151 | |
152 | show_search = (cgit_cmd == CMD_LOG); |
152 | show_search = (cgit_cmd == CMD_LOG); |
153 | cgit_print_http_headers(&ctx); |
153 | cgit_print_http_headers(&ctx); |
154 | cgit_print_docstart(&ctx); |
154 | cgit_print_docstart(&ctx); |
155 | if (!cgit_cmd) { |
155 | if (!cgit_cmd) { |
156 | cgit_print_pageheader(&ctx); |
156 | cgit_print_pageheader(&ctx); |
157 | cgit_print_summary(); |
157 | cgit_print_summary(); |
158 | cgit_print_docend(); |
158 | cgit_print_docend(); |
159 | return; |
159 | return; |
160 | } |
160 | } |
161 | |
161 | |
162 | cgit_print_pageheader(&ctx); |
162 | cgit_print_pageheader(&ctx); |
163 | |
163 | |
164 | switch(cgit_cmd) { |
164 | switch(cgit_cmd) { |
165 | case CMD_LOG: |
165 | case CMD_LOG: |
166 | cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, |
166 | cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, |
167 | ctx.cfg.max_commit_count, ctx.qry.grep, ctx.qry.search, |
167 | ctx.cfg.max_commit_count, ctx.qry.grep, ctx.qry.search, |
168 | ctx.qry.path, 1); |
168 | ctx.qry.path, 1); |
169 | break; |
169 | break; |
170 | case CMD_TREE: |
170 | case CMD_TREE: |
171 | cgit_print_tree(ctx.qry.sha1, ctx.qry.path); |
171 | cgit_print_tree(ctx.qry.sha1, ctx.qry.path); |
172 | break; |
172 | break; |
@@ -189,51 +189,51 @@ static void cgit_print_repo_page(struct cacheitem *item) |
189 | } |
189 | } |
190 | |
190 | |
191 | static long ttl_seconds(long ttl) |
191 | static long ttl_seconds(long ttl) |
192 | { |
192 | { |
193 | if (ttl<0) |
193 | if (ttl<0) |
194 | return 60 * 60 * 24 * 365; |
194 | return 60 * 60 * 24 * 365; |
195 | else |
195 | else |
196 | return ttl * 60; |
196 | return ttl * 60; |
197 | } |
197 | } |
198 | |
198 | |
199 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
199 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
200 | { |
200 | { |
201 | int stdout2; |
201 | int stdout2; |
202 | |
202 | |
203 | if (use_cache) { |
203 | if (use_cache) { |
204 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
204 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
205 | "Preserving STDOUT"); |
205 | "Preserving STDOUT"); |
206 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
206 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
207 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
207 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
208 | } |
208 | } |
209 | |
209 | |
210 | ctx.page.modified = time(NULL); |
210 | ctx.page.modified = time(NULL); |
211 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); |
211 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); |
212 | if (ctx.repo) |
212 | if (ctx.repo) |
213 | cgit_print_repo_page(item); |
213 | cgit_print_repo_page(); |
214 | else |
214 | else |
215 | cgit_print_repolist(item); |
215 | cgit_print_repolist(); |
216 | |
216 | |
217 | if (use_cache) { |
217 | if (use_cache) { |
218 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
218 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
219 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
219 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
220 | "Restoring original STDOUT"); |
220 | "Restoring original STDOUT"); |
221 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
221 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
222 | } |
222 | } |
223 | } |
223 | } |
224 | |
224 | |
225 | static void cgit_check_cache(struct cacheitem *item) |
225 | static void cgit_check_cache(struct cacheitem *item) |
226 | { |
226 | { |
227 | int i = 0; |
227 | int i = 0; |
228 | |
228 | |
229 | top: |
229 | top: |
230 | if (++i > ctx.cfg.max_lock_attempts) { |
230 | if (++i > ctx.cfg.max_lock_attempts) { |
231 | die("cgit_refresh_cache: unable to lock %s: %s", |
231 | die("cgit_refresh_cache: unable to lock %s: %s", |
232 | item->name, strerror(errno)); |
232 | item->name, strerror(errno)); |
233 | } |
233 | } |
234 | if (!cache_exist(item)) { |
234 | if (!cache_exist(item)) { |
235 | if (!cache_lock(item)) { |
235 | if (!cache_lock(item)) { |
236 | sleep(1); |
236 | sleep(1); |
237 | goto top; |
237 | goto top; |
238 | } |
238 | } |
239 | if (!cache_exist(item)) { |
239 | if (!cache_exist(item)) { |
|