| -rw-r--r-- | ui-tree.c | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -56,4 +56,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, { char *name; + char *fullpath; enum object_type type; unsigned long size = 0; @@ -61,4 +62,7 @@ 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); if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { @@ -68,8 +72,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, return 0; } - 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'>"); html_filemode(mode); @@ -80,13 +81,17 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, name, 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); html("<td class='links'><a href='"); @@ -151,9 +156,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, url = cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s&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); if (strcmp(match_path, buffer)) |