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) (unidiff) | |
tree | e915e78aa09d61a3492926f2eb8a1a3e59c60f4d /ui-plain.c | |
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-- | ui-plain.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,82 +1,82 @@ | |||
1 | /* ui-plain.c: functions for output of plain blobs by path | 1 | /* ui-plain.c: functions for output of plain blobs by path |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | char *curr_rev; | 13 | char *curr_rev; |
14 | char *match_path; | 14 | char *match_path; |
15 | int match; | 15 | int match; |
16 | 16 | ||
17 | static void print_object(const unsigned char *sha1, const char *path) | 17 | static void print_object(const unsigned char *sha1, const char *path) |
18 | { | 18 | { |
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); |
38 | html_raw(buf, size); | 38 | html_raw(buf, size); |
39 | match = 1; | 39 | match = 1; |
40 | } | 40 | } |
41 | 41 | ||
42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
43 | const char *pathname, unsigned mode, int stage, | 43 | const char *pathname, unsigned mode, int stage, |
44 | void *cbdata) | 44 | void *cbdata) |
45 | { | 45 | { |
46 | fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname); | 46 | fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname); |
47 | 47 | ||
48 | if (!pathname || strcmp(match_path, pathname)) | 48 | if (!pathname || strcmp(match_path, pathname)) |
49 | return READ_TREE_RECURSIVE; | 49 | return READ_TREE_RECURSIVE; |
50 | 50 | ||
51 | if (S_ISREG(mode)) | 51 | if (S_ISREG(mode)) |
52 | print_object(sha1, pathname); | 52 | print_object(sha1, pathname); |
53 | 53 | ||
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
56 | 56 | ||
57 | void cgit_print_plain(struct cgit_context *ctx) | 57 | void cgit_print_plain(struct cgit_context *ctx) |
58 | { | 58 | { |
59 | const char *rev = ctx->qry.sha1; | 59 | const char *rev = ctx->qry.sha1; |
60 | unsigned char sha1[20]; | 60 | unsigned char sha1[20]; |
61 | struct commit *commit; | 61 | struct commit *commit; |
62 | const char *paths[] = {ctx->qry.path, NULL}; | 62 | const char *paths[] = {ctx->qry.path, NULL}; |
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 | } |