1 files changed, 18 insertions, 15 deletions

diff --git a/ui-tree.c b/ui-tree.c
index db0bef6..3b82374 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -57,2 +57,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         char *name;
+        char *fullpath;
         enum object_type type;
@@ -62,2 +63,5 @@ 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);
+
         type = sha1_object_info(sha1, &size);
@@ -69,6 +73,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         }
-        qry = fmt("h=%s&path=%s%s%s", curr_rev,
-                  cgit_query_path ? cgit_query_path : "",
-                  cgit_query_path ? "/" : "", pathname);
-        url = cgit_pageurl(cgit_query_repo, "tree", qry);
+
         html("<tr><td class='filemode'>");
@@ -81,11 +82,15 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                               sha1_to_hex(sha1)));
+                html("'>");
+                html_txt(name);
+                html("</a>");
         } else if (S_ISDIR(mode)) {
-                html("class='ls-dir'><a href='");
-                html_attr(url);
+                html("class='ls-dir'>");
+                cgit_tree_link(name, NULL, NULL, cgit_query_head,
+                               curr_rev, fullpath);
         } else {
-                html("class='ls-blob'><a href='");
-                html_attr(url);
+                html("class='ls-blob'>");
+                cgit_tree_link(name, NULL, NULL, cgit_query_head,
+                               curr_rev, fullpath);
         }
-        htmlf("'>%s</a></td>", name);
-        htmlf("<td class='filesize'>%li</td>", size);
+        htmlf("</td><td class='filesize'>%li</td>", size);
 
@@ -152,7 +157,5 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                                    fmt("h=%s&amp;path=%s", curr_rev, buffer));
-                htmlf(" / <a href='");
-                html_attr(url);
-                html("'>");
-                html_txt(xstrdup(pathname));
-                html("</a>");
+                html("/");
+                cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+                               curr_rev, buffer);