Merge branch 'lh/module-links'

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 0ee38f289a5a21e5385cd1289aa234c33bab30d6..b1adcc7b21e5044f489f751c21852400a329f322 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -46,8 +46,10 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                html("<td class='lines'><pre><code>");
                ctx.repo->source_filter->argv[1] = xstrdup(name);
                cgit_open_filter(ctx.repo->source_filter);
-               write(STDOUT_FILENO, buf, size);
+               html_raw(buf, size);
                cgit_close_filter(ctx.repo->source_filter);
+               free(ctx.repo->source_filter->argv[1]);
+               ctx.repo->source_filter->argv[1] = NULL;
                html("</code></pre></td></tr></table>\n");
                return;
        }
@@ -67,7 +69,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("<table summary='blob content' class='bin-blob'>\n");
        html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
        for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
-               htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
+               htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);
                for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                        htmlf("%*s%02x",
                              idx == 16 ? 4 : 1, "",
@@ -102,13 +104,13 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
                return;
        }
 
-       html(" (");
+       htmlf("blob: %s (", sha1_to_hex(sha1));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        curr_rev, path);
-       htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+       html(")\n");
 
        if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
-               htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
+               htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>",
                                size / 1024, ctx.cfg.max_blob_size);
                return;
        }
@@ -148,13 +150,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
-               htmlf("<a class='ls-mod' href='");
-               html_attr(fmt(ctx.repo->module_link,
-                             name,
-                             sha1_to_hex(sha1)));
-               html("'>");
-               html_txt(name);
-               html("</a>");
+               cgit_submodule_link("ls-mod", fullpath, sha1_to_hex(sha1));
        } else if (S_ISDIR(mode)) {
                cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                               curr_rev, fullpath);
@@ -175,8 +171,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath);
-       cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
-                       fullpath);
+       if (!S_ISGITLINK(mode))
+               cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+                               fullpath);
        html("</td></tr>\n");
        free(name);
        return 0;
@@ -225,17 +222,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 {
        static int state;
        static char buffer[PATH_MAX];
-       char *url;
 
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
-               url = cgit_pageurl(ctx.qry.repo, "tree",
-                                  fmt("h=%s&amp;path=%s", curr_rev, buffer));
-               html("/");
-               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
-                              curr_rev, buffer);
-
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
@@ -278,10 +268,6 @@ void cgit_print_tree(const char *rev, char *path)
                return;
        }
 
-       html("path: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
-       html("'>root</a>");
-
        if (path == NULL) {
                ls_tree(commit->tree->object.sha1, NULL);
                return;