|
diff --git a/ui-tree.c b/ui-tree.c index 9876c99..c26ba4c 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,85 +1,86 @@ |
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 "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, 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", |
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(" ("); |
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 | |
66 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
67 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
67 | const char *pathname, unsigned int mode, int stage, |
68 | const char *pathname, unsigned int mode, int stage, |
68 | void *cbdata) |
69 | void *cbdata) |
69 | { |
70 | { |
70 | char *name; |
71 | char *name; |
71 | char *fullpath; |
72 | char *fullpath; |
72 | enum object_type type; |
73 | enum object_type type; |
73 | unsigned long size = 0; |
74 | unsigned long size = 0; |
74 | |
75 | |
75 | name = xstrdup(pathname); |
76 | name = xstrdup(pathname); |
76 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
77 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
77 | ctx.qry.path ? "/" : "", name); |
78 | ctx.qry.path ? "/" : "", name); |
78 | |
79 | |
79 | if (!S_ISGITLINK(mode)) { |
80 | if (!S_ISGITLINK(mode)) { |
80 | type = sha1_object_info(sha1, &size); |
81 | type = sha1_object_info(sha1, &size); |
81 | if (type == OBJ_BAD) { |
82 | if (type == OBJ_BAD) { |
82 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
83 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
83 | name, |
84 | name, |
84 | sha1_to_hex(sha1)); |
85 | sha1_to_hex(sha1)); |
85 | return 0; |
86 | return 0; |
@@ -88,48 +89,51 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
88 | |
89 | |
89 | html("<tr><td class='ls-mode'>"); |
90 | html("<tr><td class='ls-mode'>"); |
90 | cgit_print_filemode(mode); |
91 | cgit_print_filemode(mode); |
91 | html("</td><td>"); |
92 | html("</td><td>"); |
92 | if (S_ISGITLINK(mode)) { |
93 | if (S_ISGITLINK(mode)) { |
93 | htmlf("<a class='ls-mod' href='"); |
94 | htmlf("<a class='ls-mod' href='"); |
94 | html_attr(fmt(ctx.repo->module_link, |
95 | html_attr(fmt(ctx.repo->module_link, |
95 | name, |
96 | name, |
96 | sha1_to_hex(sha1))); |
97 | sha1_to_hex(sha1))); |
97 | html("'>"); |
98 | html("'>"); |
98 | html_txt(name); |
99 | html_txt(name); |
99 | html("</a>"); |
100 | html("</a>"); |
100 | } else if (S_ISDIR(mode)) { |
101 | } else if (S_ISDIR(mode)) { |
101 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
102 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
102 | curr_rev, fullpath); |
103 | curr_rev, fullpath); |
103 | } else { |
104 | } else { |
104 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
105 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
105 | curr_rev, fullpath); |
106 | curr_rev, fullpath); |
106 | } |
107 | } |
107 | htmlf("</td><td class='ls-size'>%li</td>", size); |
108 | htmlf("</td><td class='ls-size'>%li</td>", size); |
108 | |
109 | |
109 | html("<td>"); |
110 | html("<td>"); |
110 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
111 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
111 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
112 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
| |
113 | if (ctx.repo->max_stats) |
| |
114 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, |
| |
115 | fullpath); |
112 | html("</td></tr>\n"); |
116 | html("</td></tr>\n"); |
113 | free(name); |
117 | free(name); |
114 | return 0; |
118 | return 0; |
115 | } |
119 | } |
116 | |
120 | |
117 | static void ls_head() |
121 | static void ls_head() |
118 | { |
122 | { |
119 | html("<table summary='tree listing' class='list'>\n"); |
123 | html("<table summary='tree listing' class='list'>\n"); |
120 | html("<tr class='nohover'>"); |
124 | html("<tr class='nohover'>"); |
121 | html("<th class='left'>Mode</th>"); |
125 | html("<th class='left'>Mode</th>"); |
122 | html("<th class='left'>Name</th>"); |
126 | html("<th class='left'>Name</th>"); |
123 | html("<th class='right'>Size</th>"); |
127 | html("<th class='right'>Size</th>"); |
124 | html("<th/>"); |
128 | html("<th/>"); |
125 | html("</tr>\n"); |
129 | html("</tr>\n"); |
126 | header = 1; |
130 | header = 1; |
127 | } |
131 | } |
128 | |
132 | |
129 | static void ls_tail() |
133 | static void ls_tail() |
130 | { |
134 | { |
131 | if (!header) |
135 | if (!header) |
132 | return; |
136 | return; |
133 | html("</table>\n"); |
137 | html("</table>\n"); |
134 | header = 0; |
138 | header = 0; |
135 | } |
139 | } |
|