|
diff --git a/html.c b/html.c index 83fc7a9..36e9a2f 100644 --- a/ html.c+++ b/ html.c |
|
@@ -56,9 +56,9 @@ void htmlf(const char *format, ...) |
56 | html(buf); |
56 | html(buf); |
57 | } |
57 | } |
58 | |
58 | |
59 | void html_status(int code, int more_headers) |
59 | void html_status(int code, const char *msg, int more_headers) |
60 | { |
60 | { |
61 | htmlf("Status: %d\n", code); |
61 | htmlf("Status: %d %s\n", code, msg); |
62 | if (!more_headers) |
62 | if (!more_headers) |
63 | html("\n"); |
63 | html("\n"); |
64 | } |
64 | } |
|
|
diff --git a/html.h b/html.h index 49462a2..3c32935 100644 --- a/ html.h+++ b/ html.h |
|
@@ -6,7 +6,7 @@ extern int htmlfd; |
6 | extern void html_raw(const char *txt, size_t size); |
6 | extern void html_raw(const char *txt, size_t size); |
7 | extern void html(const char *txt); |
7 | extern void html(const char *txt); |
8 | extern void htmlf(const char *format,...); |
8 | extern void htmlf(const char *format,...); |
9 | extern void html_status(int code, int more_headers); |
9 | extern void html_status(int code, const char *msg, int more_headers); |
10 | extern void html_txt(char *txt); |
10 | extern void html_txt(char *txt); |
11 | extern void html_ntxt(int len, char *txt); |
11 | extern void html_ntxt(int len, char *txt); |
12 | extern void html_attr(char *txt); |
12 | extern void html_attr(char *txt); |
|
|
|
|
@@ -48,20 +48,18 @@ static void print_pack_info(struct cgit_context *ctx) |
48 | static void send_file(struct cgit_context *ctx, char *path) |
48 | static void send_file(struct cgit_context *ctx, char *path) |
49 | { |
49 | { |
50 | struct stat st; |
50 | struct stat st; |
51 | int err; |
| |
52 | |
51 | |
53 | if (stat(path, &st)) { |
52 | if (stat(path, &st)) { |
54 | switch (errno) { |
53 | switch (errno) { |
55 | case ENOENT: |
54 | case ENOENT: |
56 | err = 404; |
55 | html_status(404, "Not found", 0); |
57 | break; |
56 | break; |
58 | case EACCES: |
57 | case EACCES: |
59 | err = 403; |
58 | html_status(403, "Forbidden", 0); |
60 | break; |
59 | break; |
61 | default: |
60 | default: |
62 | err = 400; |
61 | html_status(400, "Bad request", 0); |
63 | } |
62 | } |
64 | html_status(err, 0); |
| |
65 | return; |
63 | return; |
66 | } |
64 | } |
67 | ctx->page.mimetype = "application/octet-stream"; |
65 | ctx->page.mimetype = "application/octet-stream"; |
@@ -86,7 +84,7 @@ void cgit_clone_info(struct cgit_context *ctx) |
86 | void cgit_clone_objects(struct cgit_context *ctx) |
84 | void cgit_clone_objects(struct cgit_context *ctx) |
87 | { |
85 | { |
88 | if (!ctx->qry.path) { |
86 | if (!ctx->qry.path) { |
89 | html_status(400, 0); |
87 | html_status(400, "Bad request", 0); |
90 | return; |
88 | return; |
91 | } |
89 | } |
92 | |
90 | |
|
|
|
|
@@ -22,13 +22,13 @@ static void print_object(const unsigned char *sha1, const char *path) |
22 | |
22 | |
23 | type = sha1_object_info(sha1, &size); |
23 | type = sha1_object_info(sha1, &size); |
24 | if (type == OBJ_BAD) { |
24 | if (type == OBJ_BAD) { |
25 | html_status(404, 0); |
25 | html_status(404, "Not found", 0); |
26 | return; |
26 | return; |
27 | } |
27 | } |
28 | |
28 | |
29 | buf = read_sha1_file(sha1, &type, &size); |
29 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { |
30 | if (!buf) { |
31 | html_status(404, 0); |
31 | html_status(404, "Not found", 0); |
32 | return; |
32 | return; |
33 | } |
33 | } |
34 | ctx.page.mimetype = "text/plain"; |
34 | ctx.page.mimetype = "text/plain"; |
@@ -66,17 +66,17 @@ void cgit_print_plain(struct cgit_context *ctx) |
66 | |
66 | |
67 | curr_rev = xstrdup(rev); |
67 | curr_rev = xstrdup(rev); |
68 | if (get_sha1(rev, sha1)) { |
68 | if (get_sha1(rev, sha1)) { |
69 | html_status(404, 0); |
69 | html_status(404, "Not found", 0); |
70 | return; |
70 | return; |
71 | } |
71 | } |
72 | commit = lookup_commit_reference(sha1); |
72 | commit = lookup_commit_reference(sha1); |
73 | if (!commit || parse_commit(commit)) { |
73 | if (!commit || parse_commit(commit)) { |
74 | html_status(404, 0); |
74 | html_status(404, "Not found", 0); |
75 | return; |
75 | return; |
76 | } |
76 | } |
77 | match_path = ctx->qry.path; |
77 | match_path = ctx->qry.path; |
78 | fprintf(stderr, "[cgit] match_path=%s", match_path); |
78 | fprintf(stderr, "[cgit] match_path=%s", match_path); |
79 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
79 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
80 | if (!match) |
80 | if (!match) |
81 | html_status(404, 0); |
81 | html_status(404, "Not found", 0); |
82 | } |
82 | } |
|