|
|
|
@@ -34,27 +34,25 @@ static void print_object(const unsigned char *sha1, const char *path) |
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 | if (S_ISDIR(mode)) |
47 | |
| |
48 | if (!pathname || strcmp(match_path, pathname)) |
| |
49 | return READ_TREE_RECURSIVE; |
47 | return READ_TREE_RECURSIVE; |
50 | |
48 | |
51 | if (S_ISREG(mode)) |
49 | if (S_ISREG(mode)) |
52 | print_object(sha1, pathname); |
50 | print_object(sha1, pathname); |
53 | |
51 | |
54 | return 0; |
52 | return 0; |
55 | } |
53 | } |
56 | |
54 | |
57 | void cgit_print_plain(struct cgit_context *ctx) |
55 | void cgit_print_plain(struct cgit_context *ctx) |
58 | { |
56 | { |
59 | const char *rev = ctx->qry.sha1; |
57 | const char *rev = ctx->qry.sha1; |
60 | unsigned char sha1[20]; |
58 | unsigned char sha1[20]; |
@@ -66,17 +64,16 @@ void cgit_print_plain(struct cgit_context *ctx) |
66 | |
64 | |
67 | curr_rev = xstrdup(rev); |
65 | curr_rev = xstrdup(rev); |
68 | if (get_sha1(rev, sha1)) { |
66 | if (get_sha1(rev, sha1)) { |
69 | html_status(404, "Not found", 0); |
67 | html_status(404, "Not found", 0); |
70 | return; |
68 | return; |
71 | } |
69 | } |
72 | commit = lookup_commit_reference(sha1); |
70 | commit = lookup_commit_reference(sha1); |
73 | if (!commit || parse_commit(commit)) { |
71 | if (!commit || parse_commit(commit)) { |
74 | html_status(404, "Not found", 0); |
72 | html_status(404, "Not found", 0); |
75 | return; |
73 | return; |
76 | } |
74 | } |
77 | match_path = ctx->qry.path; |
75 | match_path = ctx->qry.path; |
78 | fprintf(stderr, "[cgit] match_path=%s", match_path); |
| |
79 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
76 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
80 | if (!match) |
77 | if (!match) |
81 | html_status(404, "Not found", 0); |
78 | html_status(404, "Not found", 0); |
82 | } |
79 | } |
|