|
diff --git a/ui-tree.c b/ui-tree.c index 94aff8f..0ee38f2 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -82,192 +82,194 @@ static void print_binary_buffer(char *buf, unsigned long size) |
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 | html(" ("); |
105 | html(" ("); |
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 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
108 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
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 (%dKB) 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); |
136 | |
136 | |
137 | if (!S_ISGITLINK(mode)) { |
137 | if (!S_ISGITLINK(mode)) { |
138 | type = sha1_object_info(sha1, &size); |
138 | type = sha1_object_info(sha1, &size); |
139 | if (type == OBJ_BAD) { |
139 | if (type == OBJ_BAD) { |
140 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
140 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
141 | name, |
141 | name, |
142 | sha1_to_hex(sha1)); |
142 | sha1_to_hex(sha1)); |
143 | return 0; |
143 | return 0; |
144 | } |
144 | } |
145 | } |
145 | } |
146 | |
146 | |
147 | html("<tr><td class='ls-mode'>"); |
147 | html("<tr><td class='ls-mode'>"); |
148 | cgit_print_filemode(mode); |
148 | cgit_print_filemode(mode); |
149 | html("</td><td>"); |
149 | html("</td><td>"); |
150 | if (S_ISGITLINK(mode)) { |
150 | if (S_ISGITLINK(mode)) { |
151 | htmlf("<a class='ls-mod' href='"); |
151 | htmlf("<a class='ls-mod' href='"); |
152 | html_attr(fmt(ctx.repo->module_link, |
152 | html_attr(fmt(ctx.repo->module_link, |
153 | name, |
153 | name, |
154 | sha1_to_hex(sha1))); |
154 | sha1_to_hex(sha1))); |
155 | html("'>"); |
155 | html("'>"); |
156 | html_txt(name); |
156 | html_txt(name); |
157 | html("</a>"); |
157 | html("</a>"); |
158 | } else if (S_ISDIR(mode)) { |
158 | } else if (S_ISDIR(mode)) { |
159 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
159 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
160 | curr_rev, fullpath); |
160 | curr_rev, fullpath); |
161 | } else { |
161 | } else { |
162 | class = strrchr(name, '.'); |
162 | class = strrchr(name, '.'); |
163 | if (class != NULL) { |
163 | if (class != NULL) { |
164 | class = fmt("ls-blob %s", class + 1); |
164 | class = fmt("ls-blob %s", class + 1); |
165 | } else |
165 | } else |
166 | class = "ls-blob"; |
166 | class = "ls-blob"; |
167 | cgit_tree_link(name, NULL, class, ctx.qry.head, |
167 | cgit_tree_link(name, NULL, class, ctx.qry.head, |
168 | curr_rev, fullpath); |
168 | curr_rev, fullpath); |
169 | } |
169 | } |
170 | htmlf("</td><td class='ls-size'>%li</td>", size); |
170 | htmlf("</td><td class='ls-size'>%li</td>", size); |
171 | |
171 | |
172 | html("<td>"); |
172 | html("<td>"); |
173 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
173 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
174 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
174 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
175 | if (ctx.repo->max_stats) |
175 | if (ctx.repo->max_stats) |
176 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, |
176 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, |
177 | fullpath); |
177 | fullpath); |
| |
178 | cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, |
| |
179 | fullpath); |
178 | html("</td></tr>\n"); |
180 | html("</td></tr>\n"); |
179 | free(name); |
181 | free(name); |
180 | return 0; |
182 | return 0; |
181 | } |
183 | } |
182 | |
184 | |
183 | static void ls_head() |
185 | static void ls_head() |
184 | { |
186 | { |
185 | html("<table summary='tree listing' class='list'>\n"); |
187 | html("<table summary='tree listing' class='list'>\n"); |
186 | html("<tr class='nohover'>"); |
188 | html("<tr class='nohover'>"); |
187 | html("<th class='left'>Mode</th>"); |
189 | html("<th class='left'>Mode</th>"); |
188 | html("<th class='left'>Name</th>"); |
190 | html("<th class='left'>Name</th>"); |
189 | html("<th class='right'>Size</th>"); |
191 | html("<th class='right'>Size</th>"); |
190 | html("<th/>"); |
192 | html("<th/>"); |
191 | html("</tr>\n"); |
193 | html("</tr>\n"); |
192 | header = 1; |
194 | header = 1; |
193 | } |
195 | } |
194 | |
196 | |
195 | static void ls_tail() |
197 | static void ls_tail() |
196 | { |
198 | { |
197 | if (!header) |
199 | if (!header) |
198 | return; |
200 | return; |
199 | html("</table>\n"); |
201 | html("</table>\n"); |
200 | header = 0; |
202 | header = 0; |
201 | } |
203 | } |
202 | |
204 | |
203 | static void ls_tree(const unsigned char *sha1, char *path) |
205 | static void ls_tree(const unsigned char *sha1, char *path) |
204 | { |
206 | { |
205 | struct tree *tree; |
207 | struct tree *tree; |
206 | |
208 | |
207 | tree = parse_tree_indirect(sha1); |
209 | tree = parse_tree_indirect(sha1); |
208 | if (!tree) { |
210 | if (!tree) { |
209 | cgit_print_error(fmt("Not a tree object: %s", |
211 | cgit_print_error(fmt("Not a tree object: %s", |
210 | sha1_to_hex(sha1))); |
212 | sha1_to_hex(sha1))); |
211 | return; |
213 | return; |
212 | } |
214 | } |
213 | |
215 | |
214 | ls_head(); |
216 | ls_head(); |
215 | read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); |
217 | read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); |
216 | ls_tail(); |
218 | ls_tail(); |
217 | } |
219 | } |
218 | |
220 | |
219 | |
221 | |
220 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
222 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
221 | const char *pathname, unsigned mode, int stage, |
223 | const char *pathname, unsigned mode, int stage, |
222 | void *cbdata) |
224 | void *cbdata) |
223 | { |
225 | { |
224 | static int state; |
226 | static int state; |
225 | static char buffer[PATH_MAX]; |
227 | static char buffer[PATH_MAX]; |
226 | char *url; |
228 | char *url; |
227 | |
229 | |
228 | if (state == 0) { |
230 | if (state == 0) { |
229 | memcpy(buffer, base, baselen); |
231 | memcpy(buffer, base, baselen); |
230 | strcpy(buffer+baselen, pathname); |
232 | strcpy(buffer+baselen, pathname); |
231 | url = cgit_pageurl(ctx.qry.repo, "tree", |
233 | url = cgit_pageurl(ctx.qry.repo, "tree", |
232 | fmt("h=%s&path=%s", curr_rev, buffer)); |
234 | fmt("h=%s&path=%s", curr_rev, buffer)); |
233 | html("/"); |
235 | html("/"); |
234 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, |
236 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, |
235 | curr_rev, buffer); |
237 | curr_rev, buffer); |
236 | |
238 | |
237 | if (strcmp(match_path, buffer)) |
239 | if (strcmp(match_path, buffer)) |
238 | return READ_TREE_RECURSIVE; |
240 | return READ_TREE_RECURSIVE; |
239 | |
241 | |
240 | if (S_ISDIR(mode)) { |
242 | if (S_ISDIR(mode)) { |
241 | state = 1; |
243 | state = 1; |
242 | ls_head(); |
244 | ls_head(); |
243 | return READ_TREE_RECURSIVE; |
245 | return READ_TREE_RECURSIVE; |
244 | } else { |
246 | } else { |
245 | print_object(sha1, buffer, pathname); |
247 | print_object(sha1, buffer, pathname); |
246 | return 0; |
248 | return 0; |
247 | } |
249 | } |
248 | } |
250 | } |
249 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); |
251 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); |
250 | return 0; |
252 | return 0; |
251 | } |
253 | } |
252 | |
254 | |
253 | |
255 | |
254 | /* |
256 | /* |
255 | * Show a tree or a blob |
257 | * Show a tree or a blob |
256 | * rev: the commit pointing at the root tree object |
258 | * rev: the commit pointing at the root tree object |
257 | * path: path to tree or blob |
259 | * path: path to tree or blob |
258 | */ |
260 | */ |
259 | void cgit_print_tree(const char *rev, char *path) |
261 | void cgit_print_tree(const char *rev, char *path) |
260 | { |
262 | { |
261 | unsigned char sha1[20]; |
263 | unsigned char sha1[20]; |
262 | struct commit *commit; |
264 | struct commit *commit; |
263 | const char *paths[] = {path, NULL}; |
265 | const char *paths[] = {path, NULL}; |
264 | |
266 | |
265 | if (!rev) |
267 | if (!rev) |
266 | rev = ctx.qry.head; |
268 | rev = ctx.qry.head; |
267 | |
269 | |
268 | curr_rev = xstrdup(rev); |
270 | curr_rev = xstrdup(rev); |
269 | if (get_sha1(rev, sha1)) { |
271 | if (get_sha1(rev, sha1)) { |
270 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
272 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
271 | return; |
273 | return; |
272 | } |
274 | } |
273 | commit = lookup_commit_reference(sha1); |
275 | commit = lookup_commit_reference(sha1); |
|