|
|
|
@@ -43,32 +43,70 @@ static void print_object(const unsigned char *sha1, const char *path) |
43 | ctx.page.mimetype = "application/octet-stream"; |
43 | ctx.page.mimetype = "application/octet-stream"; |
44 | else |
44 | else |
45 | ctx.page.mimetype = "text/plain"; |
45 | ctx.page.mimetype = "text/plain"; |
46 | } |
46 | } |
47 | ctx.page.filename = fmt("%s", path); |
47 | ctx.page.filename = fmt("%s", path); |
48 | ctx.page.size = size; |
48 | ctx.page.size = size; |
49 | ctx.page.etag = sha1_to_hex(sha1); |
49 | ctx.page.etag = sha1_to_hex(sha1); |
50 | cgit_print_http_headers(&ctx); |
50 | cgit_print_http_headers(&ctx); |
51 | html_raw(buf, size); |
51 | html_raw(buf, size); |
52 | match = 1; |
52 | match = 1; |
53 | } |
53 | } |
54 | |
54 | |
| |
55 | static void print_dir(const unsigned char *sha1, const char *path, |
| |
56 | const char *base) |
| |
57 | { |
| |
58 | char *fullpath; |
| |
59 | if (path[0] || base[0]) |
| |
60 | fullpath = fmt("/%s%s/", base, path); |
| |
61 | else |
| |
62 | fullpath = "/"; |
| |
63 | ctx.page.etag = sha1_to_hex(sha1); |
| |
64 | cgit_print_http_headers(&ctx); |
| |
65 | htmlf("<html><head><title>%s</title></head>\n<body>\n" |
| |
66 | " <h2>%s</h2>\n <ul>\n", fullpath, fullpath); |
| |
67 | if (path[0] || base[0]) |
| |
68 | html(" <li><a href=\"../\">../</a></li>\n"); |
| |
69 | match = 2; |
| |
70 | } |
| |
71 | |
| |
72 | static void print_dir_entry(const unsigned char *sha1, const char *path, |
| |
73 | unsigned mode) |
| |
74 | { |
| |
75 | const char *sep = ""; |
| |
76 | if (S_ISDIR(mode)) |
| |
77 | sep = "/"; |
| |
78 | htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep); |
| |
79 | match = 2; |
| |
80 | } |
| |
81 | |
| |
82 | static void print_dir_tail(void) |
| |
83 | { |
| |
84 | html(" </ul>\n</body></html>\n"); |
| |
85 | } |
| |
86 | |
55 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
87 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
56 | const char *pathname, unsigned mode, int stage, |
88 | const char *pathname, unsigned mode, int stage, |
57 | void *cbdata) |
89 | void *cbdata) |
58 | { |
90 | { |
59 | if (baselen == match_baselen) { |
91 | if (baselen == match_baselen) { |
60 | if (S_ISREG(mode)) |
92 | if (S_ISREG(mode)) |
61 | print_object(sha1, pathname); |
93 | print_object(sha1, pathname); |
| |
94 | else if (S_ISDIR(mode)) { |
| |
95 | print_dir(sha1, pathname, base); |
| |
96 | return READ_TREE_RECURSIVE; |
| |
97 | } |
62 | } |
98 | } |
| |
99 | else if (baselen > match_baselen) |
| |
100 | print_dir_entry(sha1, pathname, mode); |
63 | else if (S_ISDIR(mode)) |
101 | else if (S_ISDIR(mode)) |
64 | return READ_TREE_RECURSIVE; |
102 | return READ_TREE_RECURSIVE; |
65 | |
103 | |
66 | return 0; |
104 | return 0; |
67 | } |
105 | } |
68 | |
106 | |
69 | static int basedir_len(const char *path) |
107 | static int basedir_len(const char *path) |
70 | { |
108 | { |
71 | char *p = strrchr(path, '/'); |
109 | char *p = strrchr(path, '/'); |
72 | if (p) |
110 | if (p) |
73 | return p - path + 1; |
111 | return p - path + 1; |
74 | return 0; |
112 | return 0; |
@@ -84,17 +122,25 @@ void cgit_print_plain(struct cgit_context *ctx) |
84 | if (!rev) |
122 | if (!rev) |
85 | rev = ctx->qry.head; |
123 | rev = ctx->qry.head; |
86 | |
124 | |
87 | if (get_sha1(rev, sha1)) { |
125 | if (get_sha1(rev, sha1)) { |
88 | html_status(404, "Not found", 0); |
126 | html_status(404, "Not found", 0); |
89 | return; |
127 | return; |
90 | } |
128 | } |
91 | commit = lookup_commit_reference(sha1); |
129 | commit = lookup_commit_reference(sha1); |
92 | if (!commit || parse_commit(commit)) { |
130 | if (!commit || parse_commit(commit)) { |
93 | html_status(404, "Not found", 0); |
131 | html_status(404, "Not found", 0); |
94 | return; |
132 | return; |
95 | } |
133 | } |
96 | match_baselen = basedir_len(paths[0]); |
134 | if (!paths[0]) { |
| |
135 | paths[0] = ""; |
| |
136 | match_baselen = -1; |
| |
137 | print_dir(commit->tree->object.sha1, "", ""); |
| |
138 | } |
| |
139 | else |
| |
140 | match_baselen = basedir_len(paths[0]); |
97 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
141 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
98 | if (!match) |
142 | if (!match) |
99 | html_status(404, "Not found", 0); |
143 | html_status(404, "Not found", 0); |
| |
144 | else if (match == 2) |
| |
145 | print_dir_tail(); |
100 | } |
146 | } |
|