|
diff --git a/ui-tree.c b/ui-tree.c index c138877..9be3140 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,21 +1,23 @@ |
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" |
| |
11 | #include "ui-shared.h" |
10 | |
12 | |
11 | char *curr_rev; |
13 | char *curr_rev; |
12 | char *match_path; |
14 | char *match_path; |
13 | int header = 0; |
15 | int header = 0; |
14 | |
16 | |
15 | static void print_object(const unsigned char *sha1, char *path) |
17 | static void print_object(const unsigned char *sha1, char *path) |
16 | { |
18 | { |
17 | enum object_type type; |
19 | enum object_type type; |
18 | char *buf; |
20 | char *buf; |
19 | unsigned long size, lineno, start, idx; |
21 | unsigned long size, lineno, start, idx; |
20 | 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'>"; |
21 | |
23 | |
@@ -25,25 +27,25 @@ static void print_object(const unsigned char *sha1, char *path) |
25 | sha1_to_hex(sha1))); |
27 | sha1_to_hex(sha1))); |
26 | return; |
28 | return; |
27 | } |
29 | } |
28 | |
30 | |
29 | buf = read_sha1_file(sha1, &type, &size); |
31 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { |
32 | if (!buf) { |
31 | cgit_print_error(fmt("Error reading object %s", |
33 | cgit_print_error(fmt("Error reading object %s", |
32 | sha1_to_hex(sha1))); |
34 | sha1_to_hex(sha1))); |
33 | return; |
35 | return; |
34 | } |
36 | } |
35 | |
37 | |
36 | html(" blob: <a href='"); |
38 | html(" blob: <a href='"); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
39 | html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
40 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
39 | |
41 | |
40 | html("<table summary='blob content' class='blob'>\n"); |
42 | html("<table summary='blob content' class='blob'>\n"); |
41 | idx = 0; |
43 | idx = 0; |
42 | start = 0; |
44 | start = 0; |
43 | lineno = 0; |
45 | lineno = 0; |
44 | while(idx < size) { |
46 | while(idx < size) { |
45 | if (buf[idx] == '\n') { |
47 | if (buf[idx] == '\n') { |
46 | buf[idx] = '\0'; |
48 | buf[idx] = '\0'; |
47 | htmlf(linefmt, ++lineno); |
49 | htmlf(linefmt, ++lineno); |
48 | html_txt(buf + start); |
50 | html_txt(buf + start); |
49 | html("</td></tr>\n"); |
51 | html("</td></tr>\n"); |
@@ -58,57 +60,57 @@ static void print_object(const unsigned char *sha1, char *path) |
58 | } |
60 | } |
59 | |
61 | |
60 | |
62 | |
61 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
63 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
62 | const char *pathname, unsigned int mode, int stage) |
64 | const char *pathname, unsigned int mode, int stage) |
63 | { |
65 | { |
64 | char *name; |
66 | char *name; |
65 | char *fullpath; |
67 | char *fullpath; |
66 | enum object_type type; |
68 | enum object_type type; |
67 | unsigned long size = 0; |
69 | unsigned long size = 0; |
68 | |
70 | |
69 | name = xstrdup(pathname); |
71 | name = xstrdup(pathname); |
70 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
72 | fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", |
71 | cgit_query_path ? "/" : "", name); |
73 | ctx.qry.path ? "/" : "", name); |
72 | |
74 | |
73 | type = sha1_object_info(sha1, &size); |
75 | type = sha1_object_info(sha1, &size); |
74 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { |
76 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { |
75 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
77 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
76 | name, |
78 | name, |
77 | sha1_to_hex(sha1)); |
79 | sha1_to_hex(sha1)); |
78 | return 0; |
80 | return 0; |
79 | } |
81 | } |
80 | |
82 | |
81 | html("<tr><td class='ls-mode'>"); |
83 | html("<tr><td class='ls-mode'>"); |
82 | html_filemode(mode); |
84 | cgit_print_filemode(mode); |
83 | html("</td><td>"); |
85 | html("</td><td>"); |
84 | if (S_ISGITLINK(mode)) { |
86 | if (S_ISGITLINK(mode)) { |
85 | htmlf("<a class='ls-mod' href='"); |
87 | htmlf("<a class='ls-mod' href='"); |
86 | html_attr(fmt(cgit_repo->module_link, |
88 | html_attr(fmt(ctx.repo->module_link, |
87 | name, |
89 | name, |
88 | sha1_to_hex(sha1))); |
90 | sha1_to_hex(sha1))); |
89 | html("'>"); |
91 | html("'>"); |
90 | html_txt(name); |
92 | html_txt(name); |
91 | html("</a>"); |
93 | html("</a>"); |
92 | } else if (S_ISDIR(mode)) { |
94 | } else if (S_ISDIR(mode)) { |
93 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, |
95 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
94 | curr_rev, fullpath); |
96 | curr_rev, fullpath); |
95 | } else { |
97 | } else { |
96 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, |
98 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
97 | curr_rev, fullpath); |
99 | curr_rev, fullpath); |
98 | } |
100 | } |
99 | htmlf("</td><td class='ls-size'>%li</td>", size); |
101 | htmlf("</td><td class='ls-size'>%li</td>", size); |
100 | |
102 | |
101 | html("<td>"); |
103 | html("<td>"); |
102 | cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev, |
104 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
103 | fullpath, 0, NULL, NULL); |
105 | fullpath, 0, NULL, NULL); |
104 | html("</td></tr>\n"); |
106 | html("</td></tr>\n"); |
105 | free(name); |
107 | free(name); |
106 | return 0; |
108 | return 0; |
107 | } |
109 | } |
108 | |
110 | |
109 | static void ls_head() |
111 | static void ls_head() |
110 | { |
112 | { |
111 | html("<table summary='tree listing' class='list'>\n"); |
113 | html("<table summary='tree listing' class='list'>\n"); |
112 | html("<tr class='nohover'>"); |
114 | html("<tr class='nohover'>"); |
113 | html("<th class='left'>Mode</th>"); |
115 | html("<th class='left'>Mode</th>"); |
114 | html("<th class='left'>Name</th>"); |
116 | html("<th class='left'>Name</th>"); |
@@ -144,28 +146,28 @@ static void ls_tree(const unsigned char *sha1, char *path) |
144 | |
146 | |
145 | |
147 | |
146 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
148 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
147 | const char *pathname, unsigned mode, int stage) |
149 | const char *pathname, unsigned mode, int stage) |
148 | { |
150 | { |
149 | static int state; |
151 | static int state; |
150 | static char buffer[PATH_MAX]; |
152 | static char buffer[PATH_MAX]; |
151 | char *url; |
153 | char *url; |
152 | |
154 | |
153 | if (state == 0) { |
155 | if (state == 0) { |
154 | memcpy(buffer, base, baselen); |
156 | memcpy(buffer, base, baselen); |
155 | strcpy(buffer+baselen, pathname); |
157 | strcpy(buffer+baselen, pathname); |
156 | url = cgit_pageurl(cgit_query_repo, "tree", |
158 | url = cgit_pageurl(ctx.qry.repo, "tree", |
157 | fmt("h=%s&path=%s", curr_rev, buffer)); |
159 | fmt("h=%s&path=%s", curr_rev, buffer)); |
158 | html("/"); |
160 | html("/"); |
159 | cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head, |
161 | cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, |
160 | curr_rev, buffer); |
162 | curr_rev, buffer); |
161 | |
163 | |
162 | if (strcmp(match_path, buffer)) |
164 | if (strcmp(match_path, buffer)) |
163 | return READ_TREE_RECURSIVE; |
165 | return READ_TREE_RECURSIVE; |
164 | |
166 | |
165 | if (S_ISDIR(mode)) { |
167 | if (S_ISDIR(mode)) { |
166 | state = 1; |
168 | state = 1; |
167 | ls_head(); |
169 | ls_head(); |
168 | return READ_TREE_RECURSIVE; |
170 | return READ_TREE_RECURSIVE; |
169 | } else { |
171 | } else { |
170 | print_object(sha1, buffer); |
172 | print_object(sha1, buffer); |
171 | return 0; |
173 | return 0; |
@@ -179,38 +181,38 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
179 | /* |
181 | /* |
180 | * Show a tree or a blob |
182 | * Show a tree or a blob |
181 | * rev: the commit pointing at the root tree object |
183 | * rev: the commit pointing at the root tree object |
182 | * path: path to tree or blob |
184 | * path: path to tree or blob |
183 | */ |
185 | */ |
184 | void cgit_print_tree(const char *rev, char *path) |
186 | void cgit_print_tree(const char *rev, char *path) |
185 | { |
187 | { |
186 | unsigned char sha1[20]; |
188 | unsigned char sha1[20]; |
187 | struct commit *commit; |
189 | struct commit *commit; |
188 | const char *paths[] = {path, NULL}; |
190 | const char *paths[] = {path, NULL}; |
189 | |
191 | |
190 | if (!rev) |
192 | if (!rev) |
191 | rev = cgit_query_head; |
193 | rev = ctx.qry.head; |
192 | |
194 | |
193 | curr_rev = xstrdup(rev); |
195 | curr_rev = xstrdup(rev); |
194 | if (get_sha1(rev, sha1)) { |
196 | if (get_sha1(rev, sha1)) { |
195 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
197 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
196 | return; |
198 | return; |
197 | } |
199 | } |
198 | commit = lookup_commit_reference(sha1); |
200 | commit = lookup_commit_reference(sha1); |
199 | if (!commit || parse_commit(commit)) { |
201 | if (!commit || parse_commit(commit)) { |
200 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
202 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
201 | return; |
203 | return; |
202 | } |
204 | } |
203 | |
205 | |
204 | html("path: <a href='"); |
206 | html("path: <a href='"); |
205 | html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev))); |
207 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); |
206 | html("'>root</a>"); |
208 | html("'>root</a>"); |
207 | |
209 | |
208 | if (path == NULL) { |
210 | if (path == NULL) { |
209 | ls_tree(commit->tree->object.sha1, NULL); |
211 | ls_tree(commit->tree->object.sha1, NULL); |
210 | return; |
212 | return; |
211 | } |
213 | } |
212 | |
214 | |
213 | match_path = path; |
215 | match_path = path; |
214 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
216 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
215 | ls_tail(); |
217 | ls_tail(); |
216 | } |
218 | } |
|