|
diff --git a/cgit.c b/cgit.c index d1cee58..f35f605 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -248,97 +248,96 @@ static int prepare_repo_cmd(struct cgit_context *ctx) |
248 | "config error"); |
248 | "config error"); |
249 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
249 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
250 | ctx->repo = NULL; |
250 | ctx->repo = NULL; |
251 | cgit_print_http_headers(ctx); |
251 | cgit_print_http_headers(ctx); |
252 | cgit_print_docstart(ctx); |
252 | cgit_print_docstart(ctx); |
253 | cgit_print_pageheader(ctx); |
253 | cgit_print_pageheader(ctx); |
254 | cgit_print_error(tmp); |
254 | cgit_print_error(tmp); |
255 | cgit_print_docend(); |
255 | cgit_print_docend(); |
256 | return 1; |
256 | return 1; |
257 | } |
257 | } |
258 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
258 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
259 | |
259 | |
260 | if (!ctx->qry.head) { |
260 | if (!ctx->qry.head) { |
261 | ctx->qry.nohead = 1; |
261 | ctx->qry.nohead = 1; |
262 | ctx->qry.head = find_default_branch(ctx->repo); |
262 | ctx->qry.head = find_default_branch(ctx->repo); |
263 | ctx->repo->defbranch = ctx->qry.head; |
263 | ctx->repo->defbranch = ctx->qry.head; |
264 | } |
264 | } |
265 | |
265 | |
266 | if (!ctx->qry.head) { |
266 | if (!ctx->qry.head) { |
267 | cgit_print_http_headers(ctx); |
267 | cgit_print_http_headers(ctx); |
268 | cgit_print_docstart(ctx); |
268 | cgit_print_docstart(ctx); |
269 | cgit_print_pageheader(ctx); |
269 | cgit_print_pageheader(ctx); |
270 | cgit_print_error("Repository seems to be empty"); |
270 | cgit_print_error("Repository seems to be empty"); |
271 | cgit_print_docend(); |
271 | cgit_print_docend(); |
272 | return 1; |
272 | return 1; |
273 | } |
273 | } |
274 | |
274 | |
275 | if (get_sha1(ctx->qry.head, sha1)) { |
275 | if (get_sha1(ctx->qry.head, sha1)) { |
276 | tmp = xstrdup(ctx->qry.head); |
276 | tmp = xstrdup(ctx->qry.head); |
277 | ctx->qry.head = ctx->repo->defbranch; |
277 | ctx->qry.head = ctx->repo->defbranch; |
278 | cgit_print_http_headers(ctx); |
278 | cgit_print_http_headers(ctx); |
279 | cgit_print_docstart(ctx); |
279 | cgit_print_docstart(ctx); |
280 | cgit_print_pageheader(ctx); |
280 | cgit_print_pageheader(ctx); |
281 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
281 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
282 | cgit_print_docend(); |
282 | cgit_print_docend(); |
283 | return 1; |
283 | return 1; |
284 | } |
284 | } |
285 | return 0; |
285 | return 0; |
286 | } |
286 | } |
287 | |
287 | |
288 | static void process_request(void *cbdata) |
288 | static void process_request(void *cbdata) |
289 | { |
289 | { |
290 | struct cgit_context *ctx = cbdata; |
290 | struct cgit_context *ctx = cbdata; |
291 | struct cgit_cmd *cmd; |
291 | struct cgit_cmd *cmd; |
292 | |
292 | |
293 | cmd = cgit_get_cmd(ctx); |
293 | cmd = cgit_get_cmd(ctx); |
294 | if (!cmd) { |
294 | if (!cmd) { |
295 | ctx->page.title = "cgit error"; |
295 | ctx->page.title = "cgit error"; |
296 | ctx->repo = NULL; |
| |
297 | cgit_print_http_headers(ctx); |
296 | cgit_print_http_headers(ctx); |
298 | cgit_print_docstart(ctx); |
297 | cgit_print_docstart(ctx); |
299 | cgit_print_pageheader(ctx); |
298 | cgit_print_pageheader(ctx); |
300 | cgit_print_error("Invalid request"); |
299 | cgit_print_error("Invalid request"); |
301 | cgit_print_docend(); |
300 | cgit_print_docend(); |
302 | return; |
301 | return; |
303 | } |
302 | } |
304 | |
303 | |
305 | if (cmd->want_repo && !ctx->repo) { |
304 | if (cmd->want_repo && !ctx->repo) { |
306 | cgit_print_http_headers(ctx); |
305 | cgit_print_http_headers(ctx); |
307 | cgit_print_docstart(ctx); |
306 | cgit_print_docstart(ctx); |
308 | cgit_print_pageheader(ctx); |
307 | cgit_print_pageheader(ctx); |
309 | cgit_print_error(fmt("No repository selected")); |
308 | cgit_print_error(fmt("No repository selected")); |
310 | cgit_print_docend(); |
309 | cgit_print_docend(); |
311 | return; |
310 | return; |
312 | } |
311 | } |
313 | |
312 | |
314 | if (ctx->repo && prepare_repo_cmd(ctx)) |
313 | if (ctx->repo && prepare_repo_cmd(ctx)) |
315 | return; |
314 | return; |
316 | |
315 | |
317 | if (cmd->want_layout) { |
316 | if (cmd->want_layout) { |
318 | cgit_print_http_headers(ctx); |
317 | cgit_print_http_headers(ctx); |
319 | cgit_print_docstart(ctx); |
318 | cgit_print_docstart(ctx); |
320 | cgit_print_pageheader(ctx); |
319 | cgit_print_pageheader(ctx); |
321 | } |
320 | } |
322 | |
321 | |
323 | cmd->fn(ctx); |
322 | cmd->fn(ctx); |
324 | |
323 | |
325 | if (cmd->want_layout) |
324 | if (cmd->want_layout) |
326 | cgit_print_docend(); |
325 | cgit_print_docend(); |
327 | } |
326 | } |
328 | |
327 | |
329 | int cmp_repos(const void *a, const void *b) |
328 | int cmp_repos(const void *a, const void *b) |
330 | { |
329 | { |
331 | const struct cgit_repo *ra = a, *rb = b; |
330 | const struct cgit_repo *ra = a, *rb = b; |
332 | return strcmp(ra->url, rb->url); |
331 | return strcmp(ra->url, rb->url); |
333 | } |
332 | } |
334 | |
333 | |
335 | void print_repo(struct cgit_repo *repo) |
334 | void print_repo(struct cgit_repo *repo) |
336 | { |
335 | { |
337 | printf("repo.url=%s\n", repo->url); |
336 | printf("repo.url=%s\n", repo->url); |
338 | printf("repo.name=%s\n", repo->name); |
337 | printf("repo.name=%s\n", repo->name); |
339 | printf("repo.path=%s\n", repo->path); |
338 | printf("repo.path=%s\n", repo->path); |
340 | if (repo->owner) |
339 | if (repo->owner) |
341 | printf("repo.owner=%s\n", repo->owner); |
340 | printf("repo.owner=%s\n", repo->owner); |
342 | if (repo->desc) |
341 | if (repo->desc) |
343 | printf("repo.desc=%s\n", repo->desc); |
342 | printf("repo.desc=%s\n", repo->desc); |
344 | if (repo->readme) |
343 | if (repo->readme) |
|