|
diff --git a/cgit.c b/cgit.c index 3943a0f..f749b6b 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -88,193 +88,193 @@ void config_cb(const char *name, const char *value) |
88 | ctx.repo->owner = xstrdup(value); |
88 | ctx.repo->owner = xstrdup(value); |
89 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
89 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
90 | ctx.repo->defbranch = xstrdup(value); |
90 | ctx.repo->defbranch = xstrdup(value); |
91 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
91 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
92 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
92 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
93 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
93 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
94 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
94 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
95 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
95 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
96 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
96 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
97 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
97 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
98 | ctx.repo->module_link= xstrdup(value); |
98 | ctx.repo->module_link= xstrdup(value); |
99 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
99 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
100 | if (*value == '/') |
100 | if (*value == '/') |
101 | ctx.repo->readme = xstrdup(value); |
101 | ctx.repo->readme = xstrdup(value); |
102 | else |
102 | else |
103 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
103 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
104 | } else if (!strcmp(name, "include")) |
104 | } else if (!strcmp(name, "include")) |
105 | cgit_read_config(value, config_cb); |
105 | cgit_read_config(value, config_cb); |
106 | } |
106 | } |
107 | |
107 | |
108 | static void querystring_cb(const char *name, const char *value) |
108 | static void querystring_cb(const char *name, const char *value) |
109 | { |
109 | { |
110 | if (!strcmp(name,"r")) { |
110 | if (!strcmp(name,"r")) { |
111 | ctx.qry.repo = xstrdup(value); |
111 | ctx.qry.repo = xstrdup(value); |
112 | ctx.repo = cgit_get_repoinfo(value); |
112 | ctx.repo = cgit_get_repoinfo(value); |
113 | } else if (!strcmp(name, "p")) { |
113 | } else if (!strcmp(name, "p")) { |
114 | ctx.qry.page = xstrdup(value); |
114 | ctx.qry.page = xstrdup(value); |
115 | } else if (!strcmp(name, "url")) { |
115 | } else if (!strcmp(name, "url")) { |
116 | cgit_parse_url(value); |
116 | cgit_parse_url(value); |
117 | } else if (!strcmp(name, "qt")) { |
117 | } else if (!strcmp(name, "qt")) { |
118 | ctx.qry.grep = xstrdup(value); |
118 | ctx.qry.grep = xstrdup(value); |
119 | } else if (!strcmp(name, "q")) { |
119 | } else if (!strcmp(name, "q")) { |
120 | ctx.qry.search = xstrdup(value); |
120 | ctx.qry.search = xstrdup(value); |
121 | } else if (!strcmp(name, "h")) { |
121 | } else if (!strcmp(name, "h")) { |
122 | ctx.qry.head = xstrdup(value); |
122 | ctx.qry.head = xstrdup(value); |
123 | ctx.qry.has_symref = 1; |
123 | ctx.qry.has_symref = 1; |
124 | } else if (!strcmp(name, "id")) { |
124 | } else if (!strcmp(name, "id")) { |
125 | ctx.qry.sha1 = xstrdup(value); |
125 | ctx.qry.sha1 = xstrdup(value); |
126 | ctx.qry.has_sha1 = 1; |
126 | ctx.qry.has_sha1 = 1; |
127 | } else if (!strcmp(name, "id2")) { |
127 | } else if (!strcmp(name, "id2")) { |
128 | ctx.qry.sha2 = xstrdup(value); |
128 | ctx.qry.sha2 = xstrdup(value); |
129 | ctx.qry.has_sha1 = 1; |
129 | ctx.qry.has_sha1 = 1; |
130 | } else if (!strcmp(name, "ofs")) { |
130 | } else if (!strcmp(name, "ofs")) { |
131 | ctx.qry.ofs = atoi(value); |
131 | ctx.qry.ofs = atoi(value); |
132 | } else if (!strcmp(name, "path")) { |
132 | } else if (!strcmp(name, "path")) { |
133 | ctx.qry.path = trim_end(value, '/'); |
133 | ctx.qry.path = trim_end(value, '/'); |
134 | } else if (!strcmp(name, "name")) { |
134 | } else if (!strcmp(name, "name")) { |
135 | ctx.qry.name = xstrdup(value); |
135 | ctx.qry.name = xstrdup(value); |
136 | } |
136 | } |
137 | } |
137 | } |
138 | |
138 | |
139 | static void prepare_context(struct cgit_context *ctx) |
139 | static void prepare_context(struct cgit_context *ctx) |
140 | { |
140 | { |
141 | memset(ctx, 0, sizeof(ctx)); |
141 | memset(ctx, 0, sizeof(ctx)); |
142 | ctx->cfg.agefile = "info/web/last-modified"; |
142 | ctx->cfg.agefile = "info/web/last-modified"; |
143 | ctx->cfg.cache_dynamic_ttl = 5; |
143 | ctx->cfg.cache_dynamic_ttl = 5; |
144 | ctx->cfg.cache_max_create_time = 5; |
144 | ctx->cfg.cache_max_create_time = 5; |
145 | ctx->cfg.cache_repo_ttl = 5; |
145 | ctx->cfg.cache_repo_ttl = 5; |
146 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
146 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
147 | ctx->cfg.cache_root_ttl = 5; |
147 | ctx->cfg.cache_root_ttl = 5; |
148 | ctx->cfg.cache_static_ttl = -1; |
148 | ctx->cfg.cache_static_ttl = -1; |
149 | ctx->cfg.css = "/cgit.css"; |
149 | ctx->cfg.css = "/cgit.css"; |
150 | ctx->cfg.logo = "/git-logo.png"; |
150 | ctx->cfg.logo = "/git-logo.png"; |
151 | ctx->cfg.max_commit_count = 50; |
151 | ctx->cfg.max_commit_count = 50; |
152 | ctx->cfg.max_lock_attempts = 5; |
152 | ctx->cfg.max_lock_attempts = 5; |
153 | ctx->cfg.max_msg_len = 60; |
153 | ctx->cfg.max_msg_len = 60; |
154 | ctx->cfg.max_repodesc_len = 60; |
154 | ctx->cfg.max_repodesc_len = 60; |
155 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
155 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
156 | ctx->cfg.renamelimit = -1; |
156 | ctx->cfg.renamelimit = -1; |
157 | ctx->cfg.robots = "index, nofollow"; |
157 | ctx->cfg.robots = "index, nofollow"; |
158 | ctx->cfg.root_title = "Git repository browser"; |
158 | ctx->cfg.root_title = "Git repository browser"; |
159 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
159 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
160 | ctx->page.mimetype = "text/html"; |
160 | ctx->page.mimetype = "text/html"; |
161 | ctx->page.charset = PAGE_ENCODING; |
161 | ctx->page.charset = PAGE_ENCODING; |
162 | ctx->page.filename = NULL; |
162 | ctx->page.filename = NULL; |
163 | } |
163 | } |
164 | |
164 | |
165 | static int cgit_prepare_cache(struct cacheitem *item) |
165 | static int cgit_prepare_cache(struct cacheitem *item) |
166 | { |
166 | { |
167 | if (!ctx.repo && ctx.qry.repo) { |
167 | if (!ctx.repo && ctx.qry.repo) { |
168 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, |
168 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, |
169 | "Bad request"); |
169 | "Bad request"); |
170 | cgit_print_http_headers(&ctx); |
170 | cgit_print_http_headers(&ctx); |
171 | cgit_print_docstart(&ctx); |
171 | cgit_print_docstart(&ctx); |
172 | cgit_print_pageheader(&ctx); |
172 | cgit_print_pageheader(&ctx); |
173 | cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); |
173 | cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); |
174 | cgit_print_docend(); |
174 | cgit_print_docend(); |
175 | return 0; |
175 | return 0; |
176 | } |
176 | } |
177 | |
177 | |
178 | if (!ctx.repo) { |
178 | if (!ctx.repo) { |
179 | item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); |
179 | item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); |
180 | item->ttl = ctx.cfg.cache_root_ttl; |
180 | item->ttl = ctx.cfg.cache_root_ttl; |
181 | return 1; |
181 | return 1; |
182 | } |
182 | } |
183 | |
183 | |
184 | if (!cgit_cmd) { |
184 | if (!ctx.qry.page) { |
185 | item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, |
185 | item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, |
186 | cache_safe_filename(ctx.repo->url), |
186 | cache_safe_filename(ctx.repo->url), |
187 | cache_safe_filename(ctx.qry.raw))); |
187 | cache_safe_filename(ctx.qry.raw))); |
188 | item->ttl = ctx.cfg.cache_repo_ttl; |
188 | item->ttl = ctx.cfg.cache_repo_ttl; |
189 | } else { |
189 | } else { |
190 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, |
190 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, |
191 | cache_safe_filename(ctx.repo->url), |
191 | cache_safe_filename(ctx.repo->url), |
192 | ctx.qry.page, |
192 | ctx.qry.page, |
193 | cache_safe_filename(ctx.qry.raw))); |
193 | cache_safe_filename(ctx.qry.raw))); |
194 | if (ctx.qry.has_symref) |
194 | if (ctx.qry.has_symref) |
195 | item->ttl = ctx.cfg.cache_dynamic_ttl; |
195 | item->ttl = ctx.cfg.cache_dynamic_ttl; |
196 | else if (ctx.qry.has_sha1) |
196 | else if (ctx.qry.has_sha1) |
197 | item->ttl = ctx.cfg.cache_static_ttl; |
197 | item->ttl = ctx.cfg.cache_static_ttl; |
198 | else |
198 | else |
199 | item->ttl = ctx.cfg.cache_repo_ttl; |
199 | item->ttl = ctx.cfg.cache_repo_ttl; |
200 | } |
200 | } |
201 | return 1; |
201 | return 1; |
202 | } |
202 | } |
203 | |
203 | |
204 | struct refmatch { |
204 | struct refmatch { |
205 | char *req_ref; |
205 | char *req_ref; |
206 | char *first_ref; |
206 | char *first_ref; |
207 | int match; |
207 | int match; |
208 | }; |
208 | }; |
209 | |
209 | |
210 | int find_current_ref(const char *refname, const unsigned char *sha1, |
210 | int find_current_ref(const char *refname, const unsigned char *sha1, |
211 | int flags, void *cb_data) |
211 | int flags, void *cb_data) |
212 | { |
212 | { |
213 | struct refmatch *info; |
213 | struct refmatch *info; |
214 | |
214 | |
215 | info = (struct refmatch *)cb_data; |
215 | info = (struct refmatch *)cb_data; |
216 | if (!strcmp(refname, info->req_ref)) |
216 | if (!strcmp(refname, info->req_ref)) |
217 | info->match = 1; |
217 | info->match = 1; |
218 | if (!info->first_ref) |
218 | if (!info->first_ref) |
219 | info->first_ref = xstrdup(refname); |
219 | info->first_ref = xstrdup(refname); |
220 | return info->match; |
220 | return info->match; |
221 | } |
221 | } |
222 | |
222 | |
223 | char *find_default_branch(struct cgit_repo *repo) |
223 | char *find_default_branch(struct cgit_repo *repo) |
224 | { |
224 | { |
225 | struct refmatch info; |
225 | struct refmatch info; |
226 | |
226 | |
227 | info.req_ref = repo->defbranch; |
227 | info.req_ref = repo->defbranch; |
228 | info.first_ref = NULL; |
228 | info.first_ref = NULL; |
229 | info.match = 0; |
229 | info.match = 0; |
230 | for_each_branch_ref(find_current_ref, &info); |
230 | for_each_branch_ref(find_current_ref, &info); |
231 | if (info.match) |
231 | if (info.match) |
232 | return info.req_ref; |
232 | return info.req_ref; |
233 | else |
233 | else |
234 | return info.first_ref; |
234 | return info.first_ref; |
235 | } |
235 | } |
236 | |
236 | |
237 | static int prepare_repo_cmd(struct cgit_context *ctx) |
237 | static int prepare_repo_cmd(struct cgit_context *ctx) |
238 | { |
238 | { |
239 | char *tmp; |
239 | char *tmp; |
240 | unsigned char sha1[20]; |
240 | unsigned char sha1[20]; |
241 | int nongit = 0; |
241 | int nongit = 0; |
242 | |
242 | |
243 | setenv("GIT_DIR", ctx->repo->path, 1); |
243 | setenv("GIT_DIR", ctx->repo->path, 1); |
244 | setup_git_directory_gently(&nongit); |
244 | setup_git_directory_gently(&nongit); |
245 | if (nongit) { |
245 | if (nongit) { |
246 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
246 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
247 | "config error"); |
247 | "config error"); |
248 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
248 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
249 | ctx->repo = NULL; |
249 | ctx->repo = NULL; |
250 | cgit_print_http_headers(ctx); |
250 | cgit_print_http_headers(ctx); |
251 | cgit_print_docstart(ctx); |
251 | cgit_print_docstart(ctx); |
252 | cgit_print_pageheader(ctx); |
252 | cgit_print_pageheader(ctx); |
253 | cgit_print_error(tmp); |
253 | cgit_print_error(tmp); |
254 | cgit_print_docend(); |
254 | cgit_print_docend(); |
255 | return 1; |
255 | return 1; |
256 | } |
256 | } |
257 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
257 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
258 | |
258 | |
259 | if (!ctx->qry.head) { |
259 | if (!ctx->qry.head) { |
260 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
260 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
261 | ctx->repo->defbranch = ctx->qry.head; |
261 | ctx->repo->defbranch = ctx->qry.head; |
262 | } |
262 | } |
263 | |
263 | |
264 | if (!ctx->qry.head) { |
264 | if (!ctx->qry.head) { |
265 | cgit_print_http_headers(ctx); |
265 | cgit_print_http_headers(ctx); |
266 | cgit_print_docstart(ctx); |
266 | cgit_print_docstart(ctx); |
267 | cgit_print_pageheader(ctx); |
267 | cgit_print_pageheader(ctx); |
268 | cgit_print_error("Repository seems to be empty"); |
268 | cgit_print_error("Repository seems to be empty"); |
269 | cgit_print_docend(); |
269 | cgit_print_docend(); |
270 | return 1; |
270 | return 1; |
271 | } |
271 | } |
272 | |
272 | |
273 | if (get_sha1(ctx->qry.head, sha1)) { |
273 | if (get_sha1(ctx->qry.head, sha1)) { |
274 | tmp = xstrdup(ctx->qry.head); |
274 | tmp = xstrdup(ctx->qry.head); |
275 | ctx->qry.head = ctx->repo->defbranch; |
275 | ctx->qry.head = ctx->repo->defbranch; |
276 | cgit_print_http_headers(ctx); |
276 | cgit_print_http_headers(ctx); |
277 | cgit_print_docstart(ctx); |
277 | cgit_print_docstart(ctx); |
278 | cgit_print_pageheader(ctx); |
278 | cgit_print_pageheader(ctx); |
279 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
279 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
280 | cgit_print_docend(); |
280 | cgit_print_docend(); |
|