|
diff --git a/ui-tree.c b/ui-tree.c index 9be3140..2f052c7 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -7,65 +7,66 @@ |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
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, start, 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 *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'>"; |
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 | |
31 | buf = read_sha1_file(sha1, &type, &size); |
31 | buf = read_sha1_file(sha1, &type, &size); |
32 | if (!buf) { |
32 | if (!buf) { |
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(" blob: <a href='"); |
38 | html(" blob: <a href='"); |
39 | html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
39 | html_attr(cgit_pageurl(ctx.qry.repo, "blob", |
| |
40 | fmt("id=%s&path=%s", sha1_to_hex(sha1), path))); |
40 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
41 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
41 | |
42 | |
42 | html("<table summary='blob content' class='blob'>\n"); |
43 | html("<table summary='blob content' class='blob'>\n"); |
43 | idx = 0; |
44 | idx = 0; |
44 | start = 0; |
45 | start = 0; |
45 | lineno = 0; |
46 | lineno = 0; |
46 | while(idx < size) { |
47 | while(idx < size) { |
47 | if (buf[idx] == '\n') { |
48 | if (buf[idx] == '\n') { |
48 | buf[idx] = '\0'; |
49 | buf[idx] = '\0'; |
49 | htmlf(linefmt, ++lineno); |
50 | htmlf(linefmt, ++lineno); |
50 | html_txt(buf + start); |
51 | html_txt(buf + start); |
51 | html("</td></tr>\n"); |
52 | html("</td></tr>\n"); |
52 | start = idx + 1; |
53 | start = idx + 1; |
53 | } |
54 | } |
54 | idx++; |
55 | idx++; |
55 | } |
56 | } |
56 | htmlf(linefmt, ++lineno); |
57 | htmlf(linefmt, ++lineno); |
57 | html_txt(buf + start); |
58 | html_txt(buf + start); |
58 | html("</td></tr>\n"); |
59 | html("</td></tr>\n"); |
59 | html("</table>\n"); |
60 | html("</table>\n"); |
60 | } |
61 | } |
61 | |
62 | |
62 | |
63 | |
63 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
64 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
64 | const char *pathname, unsigned int mode, int stage) |
65 | const char *pathname, unsigned int mode, int stage) |
65 | { |
66 | { |
66 | char *name; |
67 | char *name; |
67 | char *fullpath; |
68 | char *fullpath; |
68 | enum object_type type; |
69 | enum object_type type; |
69 | unsigned long size = 0; |
70 | unsigned long size = 0; |
70 | |
71 | |
71 | name = xstrdup(pathname); |
72 | name = xstrdup(pathname); |
|