|
diff --git a/ui-tree.c b/ui-tree.c index 4b8e7a0..c26ba4c 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -17,10 +17,10 @@ int header = 0; |
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", |
@@ -37,29 +37,30 @@ static void print_object(const unsigned char *sha1, char *path) |
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 | |
|