author | Lars Hjemli <hjemli@gmail.com> | 2008-08-06 20:57:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-06 20:57:44 (UTC) |
commit | 885096c189574b1cf2e0897cc05aadd7b092a677 (patch) (side-by-side diff) | |
tree | e915e78aa09d61a3492926f2eb8a1a3e59c60f4d | |
parent | 65b7b876aaaf50fc15060533359d6561f4f1819a (diff) | |
download | cgit-885096c189574b1cf2e0897cc05aadd7b092a677.zip cgit-885096c189574b1cf2e0897cc05aadd7b092a677.tar.gz cgit-885096c189574b1cf2e0897cc05aadd7b092a677.tar.bz2 |
Supply status description to html_status()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | html.c | 4 | ||||
-rw-r--r-- | html.h | 2 | ||||
-rw-r--r-- | ui-clone.c | 10 | ||||
-rw-r--r-- | ui-plain.c | 10 |
4 files changed, 12 insertions, 14 deletions
@@ -53,15 +53,15 @@ void htmlf(const char *format, ...) va_start(args, format); vsnprintf(buf, sizeof(buf), format, args); va_end(args); 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"); } void html_txt(char *txt) { @@ -3,13 +3,13 @@ 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_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_hidden(char *name, char *value); extern void html_option(char *value, char *text, char *selected_value); extern void html_link_open(char *url, char *title, char *class); @@ -45,26 +45,24 @@ static void print_pack_info(struct cgit_context *ctx) htmlf("P %s\n", pack->pack_name + ofs); } static void send_file(struct cgit_context *ctx, char *path) { struct stat st; - int err; if (stat(path, &st)) { switch (errno) { case ENOENT: - err = 404; + html_status(404, "Not found", 0); break; case EACCES: - err = 403; + html_status(403, "Forbidden", 0); break; default: - err = 400; + html_status(400, "Bad request", 0); } - html_status(err, 0); return; } ctx->page.mimetype = "application/octet-stream"; ctx->page.filename = path; if (prefixcmp(ctx->repo->path, path)) ctx->page.filename += strlen(ctx->repo->path) + 1; @@ -83,13 +81,13 @@ void cgit_clone_info(struct cgit_context *ctx) for_each_ref(print_ref_info, ctx); } void cgit_clone_objects(struct cgit_context *ctx) { if (!ctx->qry.path) { - html_status(400, 0); + html_status(400, "Bad request", 0); return; } if (!strcmp(ctx->qry.path, "info/packs")) { print_pack_info(ctx); return; @@ -19,19 +19,19 @@ static void print_object(const unsigned char *sha1, const char *path) enum object_type type; char *buf; size_t size; 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) { - html_status(404, 0); + html_status(404, "Not found", 0); return; } ctx.page.mimetype = "text/plain"; ctx.page.filename = fmt("%s", path); ctx.page.size = size; cgit_print_http_headers(&ctx); @@ -63,20 +63,20 @@ void cgit_print_plain(struct cgit_context *ctx) if (!rev) rev = ctx->qry.head; 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)) { - 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) - html_status(404, 0); + html_status(404, "Not found", 0); } |