summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-08-06 20:57:44 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-08-06 20:57:44 (UTC)
commit885096c189574b1cf2e0897cc05aadd7b092a677 (patch) (unidiff)
treee915e78aa09d61a3492926f2eb8a1a3e59c60f4d
parent65b7b876aaaf50fc15060533359d6561f4f1819a (diff)
downloadcgit-885096c189574b1cf2e0897cc05aadd7b092a677.zip
cgit-885096c189574b1cf2e0897cc05aadd7b092a677.tar.gz
cgit-885096c189574b1cf2e0897cc05aadd7b092a677.tar.bz2
Supply status description to html_status()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c4
-rw-r--r--html.h2
-rw-r--r--ui-clone.c10
-rw-r--r--ui-plain.c10
4 files changed, 12 insertions, 14 deletions
diff --git a/html.c b/html.c
index 83fc7a9..36e9a2f 100644
--- a/html.c
+++ b/html.c
@@ -58,5 +58,5 @@ void htmlf(const char *format, ...)
58 58
59void html_status(int code, int more_headers) 59void 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)
diff --git a/html.h b/html.h
index 49462a2..3c32935 100644
--- a/html.h
+++ b/html.h
@@ -8,3 +8,3 @@ extern void html(const char *txt);
8extern void htmlf(const char *format,...); 8extern void htmlf(const char *format,...);
9extern void html_status(int code, int more_headers); 9extern void html_status(int code, const char *msg, int more_headers);
10extern void html_txt(char *txt); 10extern void html_txt(char *txt);
diff --git a/ui-clone.c b/ui-clone.c
index 3a037ad..81e7a4e 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -50,3 +50,2 @@ static void send_file(struct cgit_context *ctx, char *path)
50 struct stat st; 50 struct stat st;
51 int err;
52 51
@@ -55,11 +54,10 @@ static void send_file(struct cgit_context *ctx, char *path)
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;
@@ -88,3 +86,3 @@ void cgit_clone_objects(struct cgit_context *ctx)
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;
diff --git a/ui-plain.c b/ui-plain.c
index 28deae5..35888a0 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -24,3 +24,3 @@ static void print_object(const unsigned char *sha1, const char *path)
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;
@@ -30,3 +30,3 @@ static void print_object(const unsigned char *sha1, const char *path)
30 if (!buf) { 30 if (!buf) {
31 html_status(404, 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
@@ -68,3 +68,3 @@ void cgit_print_plain(struct cgit_context *ctx)
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;
@@ -73,3 +73,3 @@ void cgit_print_plain(struct cgit_context *ctx)
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;
@@ -80,3 +80,3 @@ void cgit_print_plain(struct cgit_context *ctx)
80 if (!match) 80 if (!match)
81 html_status(404, 0); 81 html_status(404, "Not found", 0);
82} 82}