log: move layout into page function

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index ed026142a4fce1f9c9f6d94a094a21ec8f9ae87d..3a97563c11fc5095fce52c63d57ca2a597160efd 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -152,6 +152,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);

+       else if (!strcmp(name, "enable-follow-links"))
+               ctx.cfg.enable_follow_links = atoi(value);

        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))


@@ -333,6 +335,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);

+       } else if (!strcmp(name, "follow")) {
+               ctx.qry.follow = atoi(value);

        }
 }
 
        }
 }
 


@@ -610,13 +614,8 @@ static int prepare_repo_cmd(void)
        if (get_sha1(ctx.qry.head, sha1)) {
                char *tmp = xstrdup(ctx.qry.head);
                ctx.qry.head = ctx.repo->defbranch;
        if (get_sha1(ctx.qry.head, sha1)) {
                char *tmp = xstrdup(ctx.qry.head);
                ctx.qry.head = ctx.repo->defbranch;

-               ctx.page.status = 404;
-               ctx.page.statusmsg = "Not found";
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("Invalid branch: %s", tmp);
-               cgit_print_docend();
+               cgit_print_error_page(404, "Not found",
+                               "Invalid branch: %s", tmp);

                free(tmp);
                return 1;
        }
                free(tmp);
                return 1;
        }


@@ -709,18 +708,13 @@ static void process_request(void)
        cmd = cgit_get_cmd();
        if (!cmd) {
                ctx.page.title = "cgit error";
        cmd = cgit_get_cmd();
        if (!cmd) {
                ctx.page.title = "cgit error";

-               ctx.page.status = 404;
-               ctx.page.statusmsg = "Not found";
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("Invalid request");
-               cgit_print_docend();
+               cgit_print_error_page(404, "Not found", "Invalid request");

                return;
        }
 
        if (!ctx.cfg.enable_http_clone && cmd->is_clone) {
                return;
        }
 
        if (!ctx.cfg.enable_http_clone && cmd->is_clone) {

-               html_status(404, "Not found", 0);
+               ctx.page.title = "cgit error";
+               cgit_print_error_page(404, "Not found", "Invalid request");

                return;
        }
 
                return;
        }
 


@@ -731,17 +725,17 @@ static void process_request(void)
        ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
 
        if (cmd->want_repo && !ctx.repo) {
        ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
 
        if (cmd->want_repo && !ctx.repo) {

-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("No repository selected");
-               cgit_print_docend();
+               cgit_print_error_page(400, "Bad request",
+                               "No repository selected");

                return;
        }
 
        if (ctx.repo && prepare_repo_cmd())
                return;
 
                return;
        }
 
        if (ctx.repo && prepare_repo_cmd())
                return;
 

+       if (cmd->pre)
+               cmd->pre();
+

        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();
        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();