summaryrefslogtreecommitdiffabout
path: root/ui-tree.c
Unidiff
Diffstat (limited to 'ui-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/ui-tree.c b/ui-tree.c
index c138877..9be3140 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,6 +7,8 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
11#include "ui-shared.h"
10 12
11char *curr_rev; 13char *curr_rev;
12char *match_path; 14char *match_path;
@@ -34,7 +36,7 @@ static void print_object(const unsigned char *sha1, char *path)
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");
@@ -67,8 +69,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
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)) {
@@ -79,27 +81,27 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
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);
@@ -153,10 +155,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
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&amp;path=%s", curr_rev, buffer)); 159 fmt("h=%s&amp;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))
@@ -188,7 +190,7 @@ void cgit_print_tree(const char *rev, char *path)
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)) {
@@ -202,7 +204,7 @@ void cgit_print_tree(const char *rev, char *path)
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) {