From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Sun, 5 Apr 2015 16:54:55 +0100 Subject: [PATCH 09/17] commit: move layout into page function In-Reply-To: References: Message-ID: This allows us to return a proper HTTP status code when an object is not found by switching from cgit_print_error() to cgit_print_error_page(). Signed-off-by: John Keeping --- cmd.c | 2 +- ui-commit.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd.c b/cmd.c index 0f67c74..73c5e40 100644 --- a/cmd.c +++ b/cmd.c @@ -146,7 +146,7 @@ struct cgit_cmd *cgit_get_cmd(void) def_cmd(atom, 1, 0, 0, 0), def_cmd(about, 0, 0, 0, 0), def_cmd(blob, 1, 0, 0, 0), - def_cmd(commit, 1, 1, 1, 0), + def_cmd(commit, 1, 0, 1, 0), def_cmd(diff, 1, 1, 1, 0), def_cmd(info, 1, 0, 0, 1), def_cmd(log, 1, 1, 1, 0), diff --git a/ui-commit.c b/ui-commit.c index d5a888d..2bca7a0 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -27,12 +27,14 @@ void cgit_print_commit(char *hex, const char *prefix) hex = ctx.qry.head; if (get_sha1(hex, sha1)) { - cgit_print_error("Bad object id: %s", hex); + cgit_print_error_page(400, "Bad request", + "Bad object id: %s", hex); return; } commit = lookup_commit_reference(sha1); if (!commit) { - cgit_print_error("Bad commit reference: %s", hex); + cgit_print_error_page(404, "Not found", + "Bad commit reference: %s", hex); return; } info = cgit_parse_commit(commit); @@ -41,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix) load_ref_decorations(DECORATE_FULL_REFS); + cgit_print_layout_start(); cgit_print_diff_ctrls(); html("\n"); html("
author"); @@ -139,4 +142,5 @@ void cgit_print_commit(char *hex, const char *prefix) } strbuf_release(¬es); cgit_free_commitinfo(info); + cgit_print_layout_end(); } -- 2.4.0.rc0.173.gb1cefcc