|
diff --git a/ui-tree.c b/ui-tree.c index 79332fc..4bf372a 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -25,66 +25,68 @@ static void print_object(const unsigned char *sha1, char *path) |
25 | if (type == OBJ_BAD) { |
25 | if (type == OBJ_BAD) { |
26 | cgit_print_error(fmt("Bad object name: %s", |
26 | cgit_print_error(fmt("Bad object name: %s", |
27 | sha1_to_hex(sha1))); |
27 | sha1_to_hex(sha1))); |
28 | return; |
28 | return; |
29 | } |
29 | } |
30 | |
30 | |
31 | buf = read_sha1_file(sha1, &type, &size); |
31 | buf = read_sha1_file(sha1, &type, &size); |
32 | if (!buf) { |
32 | if (!buf) { |
33 | cgit_print_error(fmt("Error reading object %s", |
33 | cgit_print_error(fmt("Error reading object %s", |
34 | sha1_to_hex(sha1))); |
34 | sha1_to_hex(sha1))); |
35 | return; |
35 | return; |
36 | } |
36 | } |
37 | |
37 | |
38 | html(" ("); |
38 | html(" ("); |
39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
40 | curr_rev, path); |
40 | curr_rev, path); |
41 | htmlf(")<br/>blob: %s", sha1_to_hex(sha1)); |
41 | htmlf(")<br/>blob: %s", sha1_to_hex(sha1)); |
42 | |
42 | |
43 | html("<table summary='blob content' class='blob'>\n"); |
43 | html("<table summary='blob content' class='blob'>\n"); |
44 | idx = 0; |
44 | idx = 0; |
45 | start = 0; |
45 | start = 0; |
46 | lineno = 0; |
46 | lineno = 0; |
47 | while(idx < size) { |
47 | while(idx < size) { |
48 | if (buf[idx] == '\n') { |
48 | if (buf[idx] == '\n') { |
49 | buf[idx] = '\0'; |
49 | buf[idx] = '\0'; |
50 | htmlf(linefmt, ++lineno); |
50 | htmlf(linefmt, ++lineno); |
51 | html_txt(buf + start); |
51 | html_txt(buf + start); |
52 | html("</td></tr>\n"); |
52 | html("</td></tr>\n"); |
53 | start = idx + 1; |
53 | start = idx + 1; |
54 | } |
54 | } |
55 | idx++; |
55 | idx++; |
56 | } |
56 | } |
57 | htmlf(linefmt, ++lineno); |
57 | if (start < idx) { |
58 | html_txt(buf + start); |
58 | htmlf(linefmt, ++lineno); |
| |
59 | html_txt(buf + start); |
| |
60 | } |
59 | html("</td></tr>\n"); |
61 | html("</td></tr>\n"); |
60 | html("</table>\n"); |
62 | html("</table>\n"); |
61 | } |
63 | } |
62 | |
64 | |
63 | |
65 | |
64 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
66 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
65 | const char *pathname, unsigned int mode, int stage, |
67 | const char *pathname, unsigned int mode, int stage, |
66 | void *cbdata) |
68 | void *cbdata) |
67 | { |
69 | { |
68 | char *name; |
70 | char *name; |
69 | char *fullpath; |
71 | char *fullpath; |
70 | enum object_type type; |
72 | enum object_type type; |
71 | unsigned long size = 0; |
73 | unsigned long size = 0; |
72 | |
74 | |
73 | name = xstrdup(pathname); |
75 | name = xstrdup(pathname); |
74 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
76 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
75 | ctx.qry.path ? "/" : "", name); |
77 | ctx.qry.path ? "/" : "", name); |
76 | |
78 | |
77 | if (!S_ISGITLINK(mode)) { |
79 | if (!S_ISGITLINK(mode)) { |
78 | type = sha1_object_info(sha1, &size); |
80 | type = sha1_object_info(sha1, &size); |
79 | if (type == OBJ_BAD) { |
81 | if (type == OBJ_BAD) { |
80 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
82 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
81 | name, |
83 | name, |
82 | sha1_to_hex(sha1)); |
84 | sha1_to_hex(sha1)); |
83 | return 0; |
85 | return 0; |
84 | } |
86 | } |
85 | } |
87 | } |
86 | |
88 | |
87 | html("<tr><td class='ls-mode'>"); |
89 | html("<tr><td class='ls-mode'>"); |
88 | cgit_print_filemode(mode); |
90 | cgit_print_filemode(mode); |
89 | html("</td><td>"); |
91 | html("</td><td>"); |
90 | if (S_ISGITLINK(mode)) { |
92 | if (S_ISGITLINK(mode)) { |
|