|
|
|
@@ -39,49 +39,50 @@ static void print_object(const unsigned char *sha1, const char *path) |
39 | if (mime) |
39 | if (mime) |
40 | ctx.page.mimetype = (char *)mime->util; |
40 | ctx.page.mimetype = (char *)mime->util; |
41 | } |
41 | } |
42 | if (!ctx.page.mimetype) { |
42 | if (!ctx.page.mimetype) { |
43 | if (buffer_is_binary(buf, size)) |
43 | if (buffer_is_binary(buf, size)) |
44 | ctx.page.mimetype = "application/octet-stream"; |
44 | ctx.page.mimetype = "application/octet-stream"; |
45 | else |
45 | else |
46 | ctx.page.mimetype = "text/plain"; |
46 | ctx.page.mimetype = "text/plain"; |
47 | } |
47 | } |
48 | ctx.page.filename = fmt("%s", path); |
48 | ctx.page.filename = fmt("%s", path); |
49 | ctx.page.size = size; |
49 | ctx.page.size = size; |
50 | ctx.page.etag = sha1_to_hex(sha1); |
50 | ctx.page.etag = sha1_to_hex(sha1); |
51 | cgit_print_http_headers(&ctx); |
51 | cgit_print_http_headers(&ctx); |
52 | html_raw(buf, size); |
52 | html_raw(buf, size); |
53 | match = 1; |
53 | match = 1; |
54 | } |
54 | } |
55 | |
55 | |
56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
57 | const char *pathname, unsigned mode, int stage, |
57 | const char *pathname, unsigned mode, int stage, |
58 | void *cbdata) |
58 | void *cbdata) |
59 | { |
59 | { |
60 | if (S_ISDIR(mode)) |
60 | if (S_ISDIR(mode)) |
61 | return READ_TREE_RECURSIVE; |
61 | return READ_TREE_RECURSIVE; |
62 | |
62 | |
63 | if (S_ISREG(mode)) |
63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
| |
64 | !strcmp(pathname, match_path + baselen)) |
64 | print_object(sha1, pathname); |
65 | print_object(sha1, pathname); |
65 | |
66 | |
66 | return 0; |
67 | return 0; |
67 | } |
68 | } |
68 | |
69 | |
69 | void cgit_print_plain(struct cgit_context *ctx) |
70 | void cgit_print_plain(struct cgit_context *ctx) |
70 | { |
71 | { |
71 | const char *rev = ctx->qry.sha1; |
72 | const char *rev = ctx->qry.sha1; |
72 | unsigned char sha1[20]; |
73 | unsigned char sha1[20]; |
73 | struct commit *commit; |
74 | struct commit *commit; |
74 | const char *paths[] = {ctx->qry.path, NULL}; |
75 | const char *paths[] = {ctx->qry.path, NULL}; |
75 | |
76 | |
76 | if (!rev) |
77 | if (!rev) |
77 | rev = ctx->qry.head; |
78 | rev = ctx->qry.head; |
78 | |
79 | |
79 | curr_rev = xstrdup(rev); |
80 | curr_rev = xstrdup(rev); |
80 | if (get_sha1(rev, sha1)) { |
81 | if (get_sha1(rev, sha1)) { |
81 | html_status(404, "Not found", 0); |
82 | html_status(404, "Not found", 0); |
82 | return; |
83 | return; |
83 | } |
84 | } |
84 | commit = lookup_commit_reference(sha1); |
85 | commit = lookup_commit_reference(sha1); |
85 | if (!commit || parse_commit(commit)) { |
86 | if (!commit || parse_commit(commit)) { |
86 | html_status(404, "Not found", 0); |
87 | html_status(404, "Not found", 0); |
87 | return; |
88 | return; |
|