ui-blob: Do not accept mimetype from user

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index d84b4be370bb17136430ffe40b2aa1e7eb677232..3ed1935c1eb4eb5561ccaed3f9d169b72286ca90 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -110,7 +110,7 @@ static void config_cb(const char *name, const char *value)
                ctx.repo->path = trim_end(value, '/');
        else if (ctx.repo && starts_with(name, "repo."))
                repo_config(ctx.repo, name + 5, value);
-       else if (!strcmp(name, "readme") && value != NULL)
+       else if (!strcmp(name, "readme"))
                string_list_append(&ctx.cfg.readme, xstrdup(value));
        else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
@@ -314,8 +314,6 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
-       } else if (!strcmp(name, "mimetype")) {
-               ctx.qry.mimetype = xstrdup(value);
        } else if (!strcmp(name, "s")) {
                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
@@ -614,13 +612,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;
-               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;
        }
@@ -656,7 +649,7 @@ static inline void open_auth_filter(const char *function)
 static inline void authenticate_post(void)
 {
        char buffer[MAX_AUTHENTICATION_POST_BYTES];
-       int len;
+       unsigned int len;
 
        open_auth_filter("authenticate-post");
        len = ctx.env.content_length;
@@ -713,18 +706,13 @@ static void process_request(void)
        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) {
-               html_status(404, "Not found", 0);
+               ctx.page.title = "cgit error";
+               cgit_print_error_page(404, "Not found", "Invalid request");
                return;
        }
 
@@ -735,30 +723,15 @@ static void process_request(void)
        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;
 
-       if (cmd->pre)
-               cmd->pre();
-
-       if (cmd->want_layout) {
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-       }
-
        cmd->fn();
-
-       if (cmd->want_layout)
-               cgit_print_docend();
 }
 
 static int cmp_repos(const void *a, const void *b)