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
@@ -9,2 +9,4 @@
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
@@ -36,3 +38,3 @@ static void print_object(const unsigned char *sha1, char *path)
         html(" blob: <a href='");
-        html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+        html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
         htmlf("'>%s</a>",sha1_to_hex(sha1));
@@ -69,4 +71,4 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         name = xstrdup(pathname);
-        fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-                       cgit_query_path ? "/" : "", name);
+        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                       ctx.qry.path ? "/" : "", name);
 
@@ -81,3 +83,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         html("<tr><td class='ls-mode'>");
-        html_filemode(mode);
+        cgit_print_filemode(mode);
         html("</td><td>");
@@ -85,3 +87,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                 htmlf("<a class='ls-mod' href='");
-                html_attr(fmt(cgit_repo->module_link,
+                html_attr(fmt(ctx.repo->module_link,
                               name,
@@ -92,6 +94,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         } else if (S_ISDIR(mode)) {
-                cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+                cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                                curr_rev, fullpath);
         } else {
-                cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+                cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
                                curr_rev, fullpath);
@@ -101,3 +103,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         html("<td>");
-        cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
                       fullpath, 0, NULL, NULL);
@@ -155,6 +157,6 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                 strcpy(buffer+baselen, pathname);
-                url = cgit_pageurl(cgit_query_repo, "tree",
+                url = cgit_pageurl(ctx.qry.repo, "tree",
                                    fmt("h=%s&amp;path=%s", curr_rev, buffer));
                 html("/");
-                cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+                cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
                                curr_rev, buffer);
@@ -190,3 +192,3 @@ void cgit_print_tree(const char *rev, char *path)
         if (!rev)
-                rev = cgit_query_head;
+                rev = ctx.qry.head;
 
@@ -204,3 +206,3 @@ void cgit_print_tree(const char *rev, char *path)
         html("path: <a href='");
-        html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
+        html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
         html("'>root</a>");