Teach cgit how to use PATH_INFO

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 5a2dd3f2946e3b5a2783744be144eb4628da8131..79332fc9eb22cc83bf4a098abcaf32102862b4d1 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -35,10 +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&path=%s", sha1_to_hex(sha1), path)));
-       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;
@@ -62,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;
@@ -143,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];
@@ -176,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;
 }
 
@@ -216,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();
 }