|
diff --git a/ui-tree.c b/ui-tree.c index ef44d61..15d1f5a 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -4,66 +4,69 @@ |
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 "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | char *curr_rev; |
11 | char *curr_rev; |
12 | char *match_path; |
12 | char *match_path; |
13 | int header = 0; |
13 | int header = 0; |
14 | |
14 | |
15 | static void print_object(const unsigned char *sha1, char *path) |
15 | static void print_object(const unsigned char *sha1, char *path) |
16 | { |
16 | { |
17 | enum object_type type; |
17 | enum object_type type; |
18 | unsigned char *buf; |
18 | unsigned char *buf; |
19 | unsigned long size, lineno, start, idx; |
19 | unsigned long size, lineno, start, idx; |
| |
20 | const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; |
20 | |
21 | |
21 | type = sha1_object_info(sha1, &size); |
22 | type = sha1_object_info(sha1, &size); |
22 | if (type == OBJ_BAD) { |
23 | if (type == OBJ_BAD) { |
23 | cgit_print_error(fmt("Bad object name: %s", |
24 | cgit_print_error(fmt("Bad object name: %s", |
24 | sha1_to_hex(sha1))); |
25 | sha1_to_hex(sha1))); |
25 | return; |
26 | return; |
26 | } |
27 | } |
27 | |
28 | |
28 | buf = read_sha1_file(sha1, &type, &size); |
29 | buf = read_sha1_file(sha1, &type, &size); |
29 | if (!buf) { |
30 | if (!buf) { |
30 | cgit_print_error(fmt("Error reading object %s", |
31 | cgit_print_error(fmt("Error reading object %s", |
31 | sha1_to_hex(sha1))); |
32 | sha1_to_hex(sha1))); |
32 | return; |
33 | return; |
33 | } |
34 | } |
34 | |
35 | |
35 | html(" blob: <a href='"); |
36 | html(" blob: <a href='"); |
36 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
37 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
38 | |
39 | |
39 | html("<table class='blob'>\n"); |
40 | html("<table class='blob'>\n"); |
40 | idx = 0; |
41 | idx = 0; |
41 | start = 0; |
42 | start = 0; |
42 | lineno = 0; |
43 | lineno = 0; |
43 | while(idx < size) { |
44 | while(idx < size) { |
44 | if (buf[idx] == '\n') { |
45 | if (buf[idx] == '\n') { |
45 | buf[idx] = '\0'; |
46 | buf[idx] = '\0'; |
46 | htmlf("<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>", |
47 | htmlf(linefmt, ++lineno); |
47 | ++lineno); |
| |
48 | html_txt(buf + start); |
48 | html_txt(buf + start); |
49 | html("</td></tr>\n"); |
49 | html("</td></tr>\n"); |
50 | start = idx + 1; |
50 | start = idx + 1; |
51 | } |
51 | } |
52 | idx++; |
52 | idx++; |
53 | } |
53 | } |
| |
54 | htmlf(linefmt, ++lineno); |
| |
55 | html_txt(buf + start); |
| |
56 | html("</td></tr>\n"); |
54 | html("</table>\n"); |
57 | html("</table>\n"); |
55 | } |
58 | } |
56 | |
59 | |
57 | |
60 | |
58 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
61 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
59 | const char *pathname, unsigned int mode, int stage) |
62 | const char *pathname, unsigned int mode, int stage) |
60 | { |
63 | { |
61 | char *name; |
64 | char *name; |
62 | char *fullpath; |
65 | char *fullpath; |
63 | enum object_type type; |
66 | enum object_type type; |
64 | unsigned long size = 0; |
67 | unsigned long size = 0; |
65 | |
68 | |
66 | name = xstrdup(pathname); |
69 | name = xstrdup(pathname); |
67 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
70 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
68 | cgit_query_path ? "/" : "", name); |
71 | cgit_query_path ? "/" : "", name); |
69 | |
72 | |
|