Supply status description to html_status()

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/html.c b/html.c
index 83fc7a9b7646a2dc96f87f277460c8c0857249ec..36e9a2faf22c49580f5660493320b370b2d654b9 100644 (file)
--- a/html.c
+++ b/html.c
@@ -56,9 +56,9 @@ void htmlf(const char *format, ...)
        html(buf);
 }
 
        html(buf);
 }
 

-void html_status(int code, int more_headers)
+void html_status(int code, const char *msg, int more_headers)

 {
 {

-       htmlf("Status: %d\n", code);
+       htmlf("Status: %d %s\n", code, msg);

        if (!more_headers)
                html("\n");
 }
        if (!more_headers)
                html("\n");
 }

diff --git a/html.h b/html.h
index 49462a20ff6d96ec44947fdd14f100e82145fa3c..3c3293557abd8e95f756eaebd7e2fd5f66704f34 100644 (file)
--- a/html.h
+++ b/html.h
@@ -6,7 +6,7 @@ extern int htmlfd;
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);

-extern void html_status(int code, int more_headers);
+extern void html_status(int code, const char *msg, int more_headers);

 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);

diff --git a/ui-clone.c b/ui-clone.c
index 3a037ad9a7a9d1f49fe6a4e5b0c8a446f31ce837..81e7a4e5b8126fb577dc4e1502cdb14744ff3469 100644 (file)
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -48,20 +48,18 @@ static void print_pack_info(struct cgit_context *ctx)
 static void send_file(struct cgit_context *ctx, char *path)
 {
        struct stat st;
 static void send_file(struct cgit_context *ctx, char *path)
 {
        struct stat st;

-       int err;

 
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:
 
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:

-                       err = 404;
+                       html_status(404, "Not found", 0);

                        break;
                case EACCES:
                        break;
                case EACCES:

-                       err = 403;
+                       html_status(403, "Forbidden", 0);

                        break;
                default:
                        break;
                default:

-                       err = 400;
+                       html_status(400, "Bad request", 0);

                }
                }

-               html_status(err, 0);

                return;
        }
        ctx->page.mimetype = "application/octet-stream";
                return;
        }
        ctx->page.mimetype = "application/octet-stream";


@@ -86,7 +84,7 @@ void cgit_clone_info(struct cgit_context *ctx)
 void cgit_clone_objects(struct cgit_context *ctx)
 {
        if (!ctx->qry.path) {
 void cgit_clone_objects(struct cgit_context *ctx)
 {
        if (!ctx->qry.path) {

-               html_status(400, 0);
+               html_status(400, "Bad request", 0);

                return;
        }
 
                return;
        }
 

diff --git a/ui-plain.c b/ui-plain.c
index 28deae58d748fec3546df50b3d0da90d0348e71e..35888a028ddd62c989f83c44a0924db3d122b937 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -22,13 +22,13 @@ static void print_object(const unsigned char *sha1, const char *path)
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {

-               html_status(404, 0);
+               html_status(404, "Not found", 0);

                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {

-               html_status(404, 0);
+               html_status(404, "Not found", 0);

                return;
        }
        ctx.page.mimetype = "text/plain";
                return;
        }
        ctx.page.mimetype = "text/plain";


@@ -66,17 +66,17 @@ void cgit_print_plain(struct cgit_context *ctx)
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {

-               html_status(404, 0);
+               html_status(404, "Not found", 0);

                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {

-               html_status(404, 0);
+               html_status(404, "Not found", 0);

                return;
        }
        match_path = ctx->qry.path;
        fprintf(stderr, "[cgit] match_path=%s", match_path);
        read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
        if (!match)
                return;
        }
        match_path = ctx->qry.path;
        fprintf(stderr, "[cgit] match_path=%s", match_path);
        read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
        if (!match)

-               html_status(404, 0);
+               html_status(404, "Not found", 0);

 }
 }