Merge branch 'master' of git://git.klever.net/patchwork/cgit

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 7cae85a5f299ac16f2c0840eec323a1346c576e7..5a2dd3f2946e3b5a2783744be144eb4628da8131 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
@@ -34,7 +36,8 @@ static void print_object(const unsigned char *sha1, char *path)
        }
 
        html(" blob: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       html_attr(cgit_pageurl(ctx.qry.repo, "blob",
+                              fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));
        htmlf("'>%s</a>",sha1_to_hex(sha1));
 
        html("<table summary='blob content' class='blob'>\n");
@@ -70,20 +73,22 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                       ctx.qry.path ? "/" : "", name);
 
-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
-               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-                     name,
-                     sha1_to_hex(sha1));
-               return 0;
+       if (!S_ISGITLINK(mode)) {
+               type = sha1_object_info(sha1, &size);
+               if (type == OBJ_BAD) {
+                       htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+                             name,
+                             sha1_to_hex(sha1));
+                       return 0;
+               }
        }
 
        html("<tr><td class='ls-mode'>");
-       html_filemode(mode);
+       cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
-               html_attr(fmt(cgit_repo->module_link,
+               html_attr(fmt(ctx.repo->module_link,
                              name,
                              sha1_to_hex(sha1)));
                html("'>");