|
diff --git a/ui-tree.c b/ui-tree.c index c26ba4c..a37a4e5 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,30 +1,72 @@ |
1 | /* ui-tree.c: functions for tree output |
1 | /* ui-tree.c: functions for tree output |
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 <ctype.h> |
9 | #include "cgit.h" |
10 | #include "cgit.h" |
10 | #include "html.h" |
11 | #include "html.h" |
11 | #include "ui-shared.h" |
12 | #include "ui-shared.h" |
12 | |
13 | |
13 | char *curr_rev; |
14 | char *curr_rev; |
14 | char *match_path; |
15 | char *match_path; |
15 | int header = 0; |
16 | int header = 0; |
16 | |
17 | |
| |
18 | static void print_text_buffer(char *buf, unsigned long size) |
| |
19 | { |
| |
20 | unsigned long lineno, idx; |
| |
21 | const char *numberfmt = |
| |
22 | "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
| |
23 | |
| |
24 | html("<table summary='blob content' class='blob'>\n"); |
| |
25 | html("<tr><td class='linenumbers'><pre>"); |
| |
26 | idx = 0; |
| |
27 | lineno = 0; |
| |
28 | htmlf(numberfmt, ++lineno); |
| |
29 | while(idx < size - 1) { // skip absolute last newline |
| |
30 | if (buf[idx] == '\n') |
| |
31 | htmlf(numberfmt, ++lineno); |
| |
32 | idx++; |
| |
33 | } |
| |
34 | html("</pre></td>\n"); |
| |
35 | html("<td class='lines'><pre><code>"); |
| |
36 | html_txt(buf); |
| |
37 | html("</code></pre></td></tr></table>\n"); |
| |
38 | } |
| |
39 | |
| |
40 | static void print_binary_buffer(char *buf, unsigned long size) |
| |
41 | { |
| |
42 | unsigned long ofs, idx; |
| |
43 | |
| |
44 | html("<table summary='blob content' class='bin-blob'>\n"); |
| |
45 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); |
| |
46 | for (ofs = 0; ofs < size; ofs += 32, buf += 32) { |
| |
47 | htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs); |
| |
48 | for (idx = 0; idx < 32 && ofs + idx < size; idx++) |
| |
49 | htmlf("%*s%02x", |
| |
50 | idx == 16 ? 4 : 1, "", |
| |
51 | buf[idx] & 0xff); |
| |
52 | html(" </td><td class='hex'>"); |
| |
53 | for (idx = 0; idx < 32 && ofs + idx < size; idx++) |
| |
54 | htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.'); |
| |
55 | html("</td></tr>\n"); |
| |
56 | } |
| |
57 | html("</table>\n"); |
| |
58 | } |
| |
59 | |
17 | static void print_object(const unsigned char *sha1, char *path) |
60 | static void print_object(const unsigned char *sha1, char *path) |
18 | { |
61 | { |
19 | enum object_type type; |
62 | enum object_type type; |
20 | char *buf; |
63 | char *buf; |
21 | unsigned long size, lineno, idx; |
64 | unsigned long size; |
22 | const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
| |
23 | |
65 | |
24 | type = sha1_object_info(sha1, &size); |
66 | type = sha1_object_info(sha1, &size); |
25 | if (type == OBJ_BAD) { |
67 | if (type == OBJ_BAD) { |
26 | cgit_print_error(fmt("Bad object name: %s", |
68 | cgit_print_error(fmt("Bad object name: %s", |
27 | sha1_to_hex(sha1))); |
69 | sha1_to_hex(sha1))); |
28 | return; |
70 | return; |
29 | } |
71 | } |
30 | |
72 | |
@@ -35,37 +77,20 @@ static void print_object(const unsigned char *sha1, char *path) |
35 | return; |
77 | return; |
36 | } |
78 | } |
37 | |
79 | |
38 | html(" ("); |
80 | html(" ("); |
39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
81 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
40 | curr_rev, path); |
82 | curr_rev, path); |
41 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
83 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
42 | |
84 | |
43 | html("<table summary='blob content' class='blob'>\n"); |
85 | if (buffer_is_binary(buf, size)) |
44 | html("<tr>\n"); |
86 | print_binary_buffer(buf, size); |
45 | |
87 | else |
46 | html("<td class='linenumbers'><pre>"); |
88 | print_text_buffer(buf, size); |
47 | idx = 0; |
| |
48 | lineno = 0; |
| |
49 | htmlf(numberfmt, ++lineno); |
| |
50 | while(idx < size - 1) { // skip absolute last newline |
| |
51 | if (buf[idx] == '\n') { |
| |
52 | htmlf(numberfmt, ++lineno); |
| |
53 | } |
| |
54 | idx++; |
| |
55 | } |
| |
56 | html("</pre></td>\n"); |
| |
57 | |
| |
58 | html("<td class='lines'><pre><code>"); |
| |
59 | html_txt(buf); |
| |
60 | html("</code></pre></td>\n"); |
| |
61 | |
| |
62 | html("</tr>\n"); |
| |
63 | html("</table>\n"); |
| |
64 | } |
89 | } |
65 | |
90 | |
66 | |
91 | |
67 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
92 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
68 | const char *pathname, unsigned int mode, int stage, |
93 | const char *pathname, unsigned int mode, int stage, |
69 | void *cbdata) |
94 | void *cbdata) |
70 | { |
95 | { |
71 | char *name; |
96 | char *name; |
|