|
diff --git a/ui-tree.c b/ui-tree.c index 75ec9cb..0b1b531 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -25,111 +25,111 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) |
25 | |
25 | |
26 | if (ctx.cfg.enable_tree_linenumbers) { |
26 | if (ctx.cfg.enable_tree_linenumbers) { |
27 | html("<tr><td class='linenumbers'><pre>"); |
27 | html("<tr><td class='linenumbers'><pre>"); |
28 | idx = 0; |
28 | idx = 0; |
29 | lineno = 0; |
29 | lineno = 0; |
30 | |
30 | |
31 | if (size) { |
31 | if (size) { |
32 | htmlf(numberfmt, ++lineno); |
32 | htmlf(numberfmt, ++lineno); |
33 | while(idx < size - 1) { // skip absolute last newline |
33 | while(idx < size - 1) { // skip absolute last newline |
34 | if (buf[idx] == '\n') |
34 | if (buf[idx] == '\n') |
35 | htmlf(numberfmt, ++lineno); |
35 | htmlf(numberfmt, ++lineno); |
36 | idx++; |
36 | idx++; |
37 | } |
37 | } |
38 | } |
38 | } |
39 | html("</pre></td>\n"); |
39 | html("</pre></td>\n"); |
40 | } |
40 | } |
41 | else { |
41 | else { |
42 | html("<tr>\n"); |
42 | html("<tr>\n"); |
43 | } |
43 | } |
44 | |
44 | |
45 | if (ctx.repo->source_filter) { |
45 | if (ctx.repo->source_filter) { |
46 | html("<td class='lines'><pre><code>"); |
46 | html("<td class='lines'><pre><code>"); |
47 | ctx.repo->source_filter->argv[1] = xstrdup(name); |
47 | ctx.repo->source_filter->argv[1] = xstrdup(name); |
48 | cgit_open_filter(ctx.repo->source_filter); |
48 | cgit_open_filter(ctx.repo->source_filter); |
49 | write(STDOUT_FILENO, buf, size); |
49 | html_raw(buf, size); |
50 | cgit_close_filter(ctx.repo->source_filter); |
50 | cgit_close_filter(ctx.repo->source_filter); |
51 | html("</code></pre></td></tr></table>\n"); |
51 | html("</code></pre></td></tr></table>\n"); |
52 | return; |
52 | return; |
53 | } |
53 | } |
54 | |
54 | |
55 | html("<td class='lines'><pre><code>"); |
55 | html("<td class='lines'><pre><code>"); |
56 | html_txt(buf); |
56 | html_txt(buf); |
57 | html("</code></pre></td></tr></table>\n"); |
57 | html("</code></pre></td></tr></table>\n"); |
58 | } |
58 | } |
59 | |
59 | |
60 | #define ROWLEN 32 |
60 | #define ROWLEN 32 |
61 | |
61 | |
62 | static void print_binary_buffer(char *buf, unsigned long size) |
62 | static void print_binary_buffer(char *buf, unsigned long size) |
63 | { |
63 | { |
64 | unsigned long ofs, idx; |
64 | unsigned long ofs, idx; |
65 | static char ascii[ROWLEN + 1]; |
65 | static char ascii[ROWLEN + 1]; |
66 | |
66 | |
67 | html("<table summary='blob content' class='bin-blob'>\n"); |
67 | html("<table summary='blob content' class='bin-blob'>\n"); |
68 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); |
68 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); |
69 | for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) { |
69 | for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) { |
70 | htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs); |
70 | htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs); |
71 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) |
71 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) |
72 | htmlf("%*s%02x", |
72 | htmlf("%*s%02x", |
73 | idx == 16 ? 4 : 1, "", |
73 | idx == 16 ? 4 : 1, "", |
74 | buf[idx] & 0xff); |
74 | buf[idx] & 0xff); |
75 | html(" </td><td class='hex'>"); |
75 | html(" </td><td class='hex'>"); |
76 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) |
76 | for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) |
77 | ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; |
77 | ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; |
78 | ascii[idx] = '\0'; |
78 | ascii[idx] = '\0'; |
79 | html_txt(ascii); |
79 | html_txt(ascii); |
80 | html("</td></tr>\n"); |
80 | html("</td></tr>\n"); |
81 | } |
81 | } |
82 | html("</table>\n"); |
82 | html("</table>\n"); |
83 | } |
83 | } |
84 | |
84 | |
85 | static void print_object(const unsigned char *sha1, char *path, const char *basename) |
85 | static void print_object(const unsigned char *sha1, char *path, const char *basename) |
86 | { |
86 | { |
87 | enum object_type type; |
87 | enum object_type type; |
88 | char *buf; |
88 | char *buf; |
89 | unsigned long size; |
89 | unsigned long size; |
90 | |
90 | |
91 | type = sha1_object_info(sha1, &size); |
91 | type = sha1_object_info(sha1, &size); |
92 | if (type == OBJ_BAD) { |
92 | if (type == OBJ_BAD) { |
93 | cgit_print_error(fmt("Bad object name: %s", |
93 | cgit_print_error(fmt("Bad object name: %s", |
94 | sha1_to_hex(sha1))); |
94 | sha1_to_hex(sha1))); |
95 | return; |
95 | return; |
96 | } |
96 | } |
97 | |
97 | |
98 | buf = read_sha1_file(sha1, &type, &size); |
98 | buf = read_sha1_file(sha1, &type, &size); |
99 | if (!buf) { |
99 | if (!buf) { |
100 | cgit_print_error(fmt("Error reading object %s", |
100 | cgit_print_error(fmt("Error reading object %s", |
101 | sha1_to_hex(sha1))); |
101 | sha1_to_hex(sha1))); |
102 | return; |
102 | return; |
103 | } |
103 | } |
104 | |
104 | |
105 | htmlf("blob: %s (", sha1_to_hex(sha1)); |
105 | htmlf("blob: %s (", sha1_to_hex(sha1)); |
106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
106 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
107 | curr_rev, path); |
107 | curr_rev, path); |
108 | html(")\n"); |
108 | html(")\n"); |
109 | |
109 | |
110 | if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { |
110 | if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { |
111 | htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", |
111 | htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>", |
112 | size / 1024, ctx.cfg.max_blob_size); |
112 | size / 1024, ctx.cfg.max_blob_size); |
113 | return; |
113 | return; |
114 | } |
114 | } |
115 | |
115 | |
116 | if (buffer_is_binary(buf, size)) |
116 | if (buffer_is_binary(buf, size)) |
117 | print_binary_buffer(buf, size); |
117 | print_binary_buffer(buf, size); |
118 | else |
118 | else |
119 | print_text_buffer(basename, buf, size); |
119 | print_text_buffer(basename, buf, size); |
120 | } |
120 | } |
121 | |
121 | |
122 | |
122 | |
123 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
123 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
124 | const char *pathname, unsigned int mode, int stage, |
124 | const char *pathname, unsigned int mode, int stage, |
125 | void *cbdata) |
125 | void *cbdata) |
126 | { |
126 | { |
127 | char *name; |
127 | char *name; |
128 | char *fullpath; |
128 | char *fullpath; |
129 | char *class; |
129 | char *class; |
130 | enum object_type type; |
130 | enum object_type type; |
131 | unsigned long size = 0; |
131 | unsigned long size = 0; |
132 | |
132 | |
133 | name = xstrdup(pathname); |
133 | name = xstrdup(pathname); |
134 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
134 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
135 | ctx.qry.path ? "/" : "", name); |
135 | ctx.qry.path ? "/" : "", name); |
|