|
diff --git a/ui-tree.c b/ui-tree.c index c4d75ab..54dcdbe 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -2,69 +2,72 @@ |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 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 | |
10 | |
11 | |
11 | |
12 | static int print_entry(const unsigned char *sha1, const char *base, |
12 | static int print_entry(const unsigned char *sha1, const char *base, |
13 | int baselen, const char *pathname, unsigned int mode, |
13 | int baselen, const char *pathname, unsigned int mode, |
14 | int stage) |
14 | int stage) |
15 | { |
15 | { |
16 | char *name; |
16 | char *name; |
17 | char type[20]; |
17 | char type[20]; |
18 | unsigned long size; |
18 | unsigned long size; |
19 | |
19 | |
20 | if (sha1_object_info(sha1, type, &size)) { |
20 | if (sha1_object_info(sha1, type, &size)) { |
21 | cgit_print_error(fmt("Bad object name: %s", |
21 | cgit_print_error(fmt("Bad object name: %s", |
22 | sha1_to_hex(sha1))); |
22 | sha1_to_hex(sha1))); |
23 | return 0; |
23 | return 0; |
24 | } |
24 | } |
25 | name = xstrdup(pathname); |
25 | name = xstrdup(pathname); |
26 | html("<tr><td>"); |
26 | html("<tr><td class='filemode'>"); |
| |
27 | html_filemode(mode); |
| |
28 | html("</td><td>"); |
27 | if (S_ISDIR(mode)) { |
29 | if (S_ISDIR(mode)) { |
28 | html("<div class='ls-dir'><a href='"); |
30 | html("<div class='ls-dir'><a href='"); |
29 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
31 | html_attr(cgit_pageurl(cgit_query_repo, "tree", |
30 | fmt("id=%s", sha1_to_hex(sha1)))); |
32 | fmt("id=%s", sha1_to_hex(sha1)))); |
31 | } else { |
33 | } else { |
32 | html("<div class='ls-blob'><a href='"); |
34 | html("<div class='ls-blob'><a href='"); |
33 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
35 | html_attr(cgit_pageurl(cgit_query_repo, "view", |
34 | fmt("id=%s", sha1_to_hex(sha1)))); |
36 | fmt("id=%s", sha1_to_hex(sha1)))); |
35 | } |
37 | } |
36 | html("'>"); |
38 | html("'>"); |
37 | html_txt(name); |
39 | html_txt(name); |
38 | if (S_ISDIR(mode)) |
40 | if (S_ISDIR(mode)) |
39 | html("/"); |
41 | html("/"); |
40 | html("</a></div></td>"); |
42 | html("</a></div></td>"); |
41 | htmlf("<td class='filesize'>%li</td>", size); |
43 | htmlf("<td class='filesize'>%li</td>", size); |
42 | htmlf("<td class='filemode'>%06o</td>", mode); |
| |
43 | html("</tr>\n"); |
44 | html("</tr>\n"); |
44 | free(name); |
45 | free(name); |
45 | return 0; |
46 | return 0; |
46 | } |
47 | } |
47 | |
48 | |
48 | void cgit_print_tree(const char *hex) |
49 | void cgit_print_tree(const char *hex) |
49 | { |
50 | { |
50 | struct tree *tree; |
51 | struct tree *tree; |
51 | unsigned char sha1[20]; |
52 | unsigned char sha1[20]; |
52 | |
53 | |
53 | if (get_sha1_hex(hex, sha1)) { |
54 | if (get_sha1_hex(hex, sha1)) { |
54 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
55 | cgit_print_error(fmt("Invalid object id: %s", hex)); |
55 | return; |
56 | return; |
56 | } |
57 | } |
57 | tree = parse_tree_indirect(sha1); |
58 | tree = parse_tree_indirect(sha1); |
58 | if (!tree) { |
59 | if (!tree) { |
59 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
60 | cgit_print_error(fmt("Not a tree object: %s", hex)); |
60 | return; |
61 | return; |
61 | } |
62 | } |
62 | |
63 | |
63 | html("<h2>Tree content</h2>\n"); |
64 | html("<h2>Tree content</h2>\n"); |
64 | html("<table class='list'>\n"); |
65 | html("<table class='list'>\n"); |
65 | html("<tr><th class='left'>Name</th>"); |
66 | html("<tr>"); |
| |
67 | html("<th class='left'>Mode</th>"); |
| |
68 | html("<th class='left'>Name</th>"); |
66 | html("<th class='right'>Size</th>"); |
69 | html("<th class='right'>Size</th>"); |
67 | html("<th class='right'>Mode</th></tr>\n"); |
70 | html("</tr>\n"); |
68 | read_tree_recursive(tree, "", 0, 1, NULL, print_entry); |
71 | read_tree_recursive(tree, "", 0, 1, NULL, print_entry); |
69 | html("</table>\n"); |
72 | html("</table>\n"); |
70 | } |
73 | } |
|