|
diff --git a/ui-tree.c b/ui-tree.c index 4bf372a..c26ba4c 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -13,18 +13,18 @@ |
13 | char *curr_rev; |
13 | char *curr_rev; |
14 | char *match_path; |
14 | char *match_path; |
15 | int header = 0; |
15 | int header = 0; |
16 | |
16 | |
17 | static void print_object(const unsigned char *sha1, char *path) |
17 | static void print_object(const unsigned char *sha1, char *path) |
18 | { |
18 | { |
19 | enum object_type type; |
19 | enum object_type type; |
20 | char *buf; |
20 | char *buf; |
21 | unsigned long size, lineno, start, idx; |
21 | unsigned long size, lineno, idx; |
22 | const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; |
22 | const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
23 | |
23 | |
24 | type = sha1_object_info(sha1, &size); |
24 | type = sha1_object_info(sha1, &size); |
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 | |
@@ -33,37 +33,38 @@ static void print_object(const unsigned char *sha1, char *path) |
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\n", 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 | html("<tr>\n"); |
| |
45 | |
| |
46 | html("<td class='linenumbers'><pre>"); |
44 | idx = 0; |
47 | idx = 0; |
45 | start = 0; |
| |
46 | lineno = 0; |
48 | lineno = 0; |
47 | while(idx < size) { |
49 | htmlf(numberfmt, ++lineno); |
| |
50 | while(idx < size - 1) { // skip absolute last newline |
48 | if (buf[idx] == '\n') { |
51 | if (buf[idx] == '\n') { |
49 | buf[idx] = '\0'; |
52 | htmlf(numberfmt, ++lineno); |
50 | htmlf(linefmt, ++lineno); |
| |
51 | html_txt(buf + start); |
| |
52 | html("</td></tr>\n"); |
| |
53 | start = idx + 1; |
| |
54 | } |
53 | } |
55 | idx++; |
54 | idx++; |
56 | } |
55 | } |
57 | if (start < idx) { |
56 | html("</pre></td>\n"); |
58 | htmlf(linefmt, ++lineno); |
57 | |
59 | html_txt(buf + start); |
58 | html("<td class='lines'><pre><code>"); |
60 | } |
59 | html_txt(buf); |
61 | html("</td></tr>\n"); |
60 | html("</code></pre></td>\n"); |
| |
61 | |
| |
62 | html("</tr>\n"); |
62 | html("</table>\n"); |
63 | html("</table>\n"); |
63 | } |
64 | } |
64 | |
65 | |
65 | |
66 | |
66 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
67 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
67 | const char *pathname, unsigned int mode, int stage, |
68 | const char *pathname, unsigned int mode, int stage, |
68 | void *cbdata) |
69 | void *cbdata) |
69 | { |
70 | { |
@@ -103,17 +104,20 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
103 | } else { |
104 | } else { |
104 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
105 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
105 | curr_rev, fullpath); |
106 | curr_rev, fullpath); |
106 | } |
107 | } |
107 | htmlf("</td><td class='ls-size'>%li</td>", size); |
108 | htmlf("</td><td class='ls-size'>%li</td>", size); |
108 | |
109 | |
109 | html("<td>"); |
110 | html("<td>"); |
110 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
111 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
111 | fullpath, 0, NULL, NULL); |
112 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
| |
113 | if (ctx.repo->max_stats) |
| |
114 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, |
| |
115 | fullpath); |
112 | html("</td></tr>\n"); |
116 | html("</td></tr>\n"); |
113 | free(name); |
117 | free(name); |
114 | return 0; |
118 | return 0; |
115 | } |
119 | } |
116 | |
120 | |
117 | static void ls_head() |
121 | static void ls_head() |
118 | { |
122 | { |
119 | html("<table summary='tree listing' class='list'>\n"); |
123 | html("<table summary='tree listing' class='list'>\n"); |
|