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
@@ -53,15 +53,15 @@ void htmlf(const char *format, ...)
53 va_start(args, format); 53 va_start(args, format);
54 vsnprintf(buf, sizeof(buf), format, args); 54 vsnprintf(buf, sizeof(buf), format, args);
55 va_end(args); 55 va_end(args);
56 html(buf); 56 html(buf);
57} 57}
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)
63 html("\n"); 63 html("\n");
64} 64}
65 65
66void html_txt(char *txt) 66void html_txt(char *txt)
67{ 67{
diff --git a/html.h b/html.h
index 49462a2..3c32935 100644
--- a/html.h
+++ b/html.h
@@ -3,13 +3,13 @@
3 3
4extern int htmlfd; 4extern int htmlfd;
5 5
6extern void html_raw(const char *txt, size_t size); 6extern void html_raw(const char *txt, size_t size);
7extern void html(const char *txt); 7extern 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);
11extern void html_ntxt(int len, char *txt); 11extern void html_ntxt(int len, char *txt);
12extern void html_attr(char *txt); 12extern void html_attr(char *txt);
13extern void html_hidden(char *name, char *value); 13extern void html_hidden(char *name, char *value);
14extern void html_option(char *value, char *text, char *selected_value); 14extern void html_option(char *value, char *text, char *selected_value);
15extern void html_link_open(char *url, char *title, char *class); 15extern void html_link_open(char *url, char *title, char *class);
diff --git a/ui-clone.c b/ui-clone.c
index 3a037ad..81e7a4e 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -45,26 +45,24 @@ static void print_pack_info(struct cgit_context *ctx)
45 htmlf("P %s\n", pack->pack_name + ofs); 45 htmlf("P %s\n", pack->pack_name + ofs);
46} 46}
47 47
48static void send_file(struct cgit_context *ctx, char *path) 48static 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";
68 ctx->page.filename = path; 66 ctx->page.filename = path;
69 if (prefixcmp(ctx->repo->path, path)) 67 if (prefixcmp(ctx->repo->path, path))
70 ctx->page.filename += strlen(ctx->repo->path) + 1; 68 ctx->page.filename += strlen(ctx->repo->path) + 1;
@@ -83,13 +81,13 @@ void cgit_clone_info(struct cgit_context *ctx)
83 for_each_ref(print_ref_info, ctx); 81 for_each_ref(print_ref_info, ctx);
84} 82}
85 83
86void cgit_clone_objects(struct cgit_context *ctx) 84void 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
93 if (!strcmp(ctx->qry.path, "info/packs")) { 91 if (!strcmp(ctx->qry.path, "info/packs")) {
94 print_pack_info(ctx); 92 print_pack_info(ctx);
95 return; 93 return;
diff --git a/ui-plain.c b/ui-plain.c
index 28deae5..35888a0 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -19,19 +19,19 @@ static void print_object(const unsigned char *sha1, const char *path)
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf;
21 size_t size; 21 size_t size;
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";
35 ctx.page.filename = fmt("%s", path); 35 ctx.page.filename = fmt("%s", path);
36 ctx.page.size = size; 36 ctx.page.size = size;
37 cgit_print_http_headers(&ctx); 37 cgit_print_http_headers(&ctx);
@@ -63,20 +63,20 @@ void cgit_print_plain(struct cgit_context *ctx)
63 63
64 if (!rev) 64 if (!rev)
65 rev = ctx->qry.head; 65 rev = ctx->qry.head;
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}