Merge branch 'lh/escape-urls'

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 9be3140c40b7583bfa07a435735f958c6d39b723..79332fc9eb22cc83bf4a098abcaf32102862b4d1 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -35,9 +35,10 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
-       html(" blob: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
-       htmlf("'>%s</a>",sha1_to_hex(sha1));
+       html(" (");
+       cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
+                       curr_rev, path);
+       htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
 
        html("<table summary='blob content' class='blob'>\n");
        idx = 0;
@@ -61,7 +62,8 @@ static void print_object(const unsigned char *sha1, char *path)
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
-                  const char *pathname, unsigned int mode, int stage)
+                  const char *pathname, unsigned int mode, int stage,
+                  void *cbdata)
 {
        char *name;
        char *fullpath;
@@ -72,12 +74,14 @@ 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'>");
@@ -140,13 +144,14 @@ static void ls_tree(const unsigned char *sha1, char *path)
        }
 
        ls_head();
-       read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
+       read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
        ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-                    const char *pathname, unsigned mode, int stage)
+                    const char *pathname, unsigned mode, int stage,
+                    void *cbdata)
 {
        static int state;
        static char buffer[PATH_MAX];
@@ -173,7 +178,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        return 0;
                }
        }
-       ls_item(sha1, base, baselen, pathname, mode, stage);
+       ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
        return 0;
 }
 
@@ -213,6 +218,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
-       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
+       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
        ls_tail();
 }