|
diff --git a/ui-tree.c b/ui-tree.c index 0ee38f2..75ec9cb 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -97,20 +97,20 @@ static void print_object(const unsigned char *sha1, char *path, const char *base |
97 | |
97 | |
98 | buf = read_sha1_file(sha1, &type, &size); |
98 | buf = read_sha1_file(sha1, &type, &size); |
99 | if (!buf) { |
99 | if (!buf) { |
100 | cgit_print_error(fmt("Error reading object %s", |
100 | cgit_print_error(fmt("Error reading object %s", |
101 | sha1_to_hex(sha1))); |
101 | sha1_to_hex(sha1))); |
102 | return; |
102 | return; |
103 | } |
103 | } |
104 | |
104 | |
105 | html(" ("); |
105 | htmlf("blob: %s (", sha1_to_hex(sha1)); |
106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
107 | curr_rev, path); |
107 | curr_rev, path); |
108 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
108 | html(")\n"); |
109 | |
109 | |
110 | if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { |
110 | if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { |
111 | htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", |
111 | htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", |
112 | size / 1024, ctx.cfg.max_blob_size); |
112 | size / 1024, ctx.cfg.max_blob_size); |
113 | return; |
113 | return; |
114 | } |
114 | } |
115 | |
115 | |
116 | if (buffer_is_binary(buf, size)) |
116 | if (buffer_is_binary(buf, size)) |
@@ -220,27 +220,20 @@ static void ls_tree(const unsigned char *sha1, char *path) |
220 | |
220 | |
221 | |
221 | |
222 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
222 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
223 | const char *pathname, unsigned mode, int stage, |
223 | const char *pathname, unsigned mode, int stage, |
224 | void *cbdata) |
224 | void *cbdata) |
225 | { |
225 | { |
226 | static int state; |
226 | static int state; |
227 | static char buffer[PATH_MAX]; |
227 | static char buffer[PATH_MAX]; |
228 | char *url; |
| |
229 | |
228 | |
230 | if (state == 0) { |
229 | if (state == 0) { |
231 | memcpy(buffer, base, baselen); |
230 | memcpy(buffer, base, baselen); |
232 | strcpy(buffer+baselen, pathname); |
231 | strcpy(buffer+baselen, pathname); |
233 | url = cgit_pageurl(ctx.qry.repo, "tree", |
| |
234 | fmt("h=%s&path=%s", curr_rev, buffer)); |
| |
235 | html("/"); |
| |
236 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, |
| |
237 | curr_rev, buffer); |
| |
238 | |
| |
239 | if (strcmp(match_path, buffer)) |
232 | if (strcmp(match_path, buffer)) |
240 | return READ_TREE_RECURSIVE; |
233 | return READ_TREE_RECURSIVE; |
241 | |
234 | |
242 | if (S_ISDIR(mode)) { |
235 | if (S_ISDIR(mode)) { |
243 | state = 1; |
236 | state = 1; |
244 | ls_head(); |
237 | ls_head(); |
245 | return READ_TREE_RECURSIVE; |
238 | return READ_TREE_RECURSIVE; |
246 | } else { |
239 | } else { |
@@ -273,20 +266,16 @@ void cgit_print_tree(const char *rev, char *path) |
273 | return; |
266 | return; |
274 | } |
267 | } |
275 | commit = lookup_commit_reference(sha1); |
268 | commit = lookup_commit_reference(sha1); |
276 | if (!commit || parse_commit(commit)) { |
269 | if (!commit || parse_commit(commit)) { |
277 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
270 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
278 | return; |
271 | return; |
279 | } |
272 | } |
280 | |
273 | |
281 | html("path: <a href='"); |
| |
282 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); |
| |
283 | html("'>root</a>"); |
| |
284 | |
| |
285 | if (path == NULL) { |
274 | if (path == NULL) { |
286 | ls_tree(commit->tree->object.sha1, NULL); |
275 | ls_tree(commit->tree->object.sha1, NULL); |
287 | return; |
276 | return; |
288 | } |
277 | } |
289 | |
278 | |
290 | match_path = path; |
279 | match_path = path; |
291 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
280 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
292 | ls_tail(); |
281 | ls_tail(); |
|