Optionally generate verbose parent links

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index c608754f3e8e930169fda2ad08b7aba00a07cdb1..94aff8f5d176df3aa544bb63e4146c19f66a0447 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -22,8 +22,28 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
 
        html("<table summary='blob content' class='blob'>\n");
+
+       if (ctx.cfg.enable_tree_linenumbers) {
+               html("<tr><td class='linenumbers'><pre>");
+               idx = 0;
+               lineno = 0;
+       
+               if (size) {
+                       htmlf(numberfmt, ++lineno);
+                       while(idx < size - 1) { // skip absolute last newline
+                               if (buf[idx] == '\n')
+                                       htmlf(numberfmt, ++lineno);
+                               idx++;
+                       }
+               }
+               html("</pre></td>\n");
+       }
+       else {
+               html("<tr>\n");
+       }
+
        if (ctx.repo->source_filter) {
-               html("<tr><td class='lines'><pre><code>");
+               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);
@@ -32,19 +52,6 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                return;
        }
 
-       html("<tr><td class='linenumbers'><pre>");
-       idx = 0;
-       lineno = 0;
-
-       if (size) {
-               htmlf(numberfmt, ++lineno);
-               while(idx < size - 1) { // skip absolute last newline
-                       if (buf[idx] == '\n')
-                               htmlf(numberfmt, ++lineno);
-                       idx++;
-               }
-       }
-       html("</pre></td>\n");
        html("<td class='lines'><pre><code>");
        html_txt(buf);
        html("</code></pre></td></tr></table>\n");
@@ -100,6 +107,12 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
                        curr_rev, path);
        htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
+       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>",
+                               size / 1024, ctx.cfg.max_blob_size);
+               return;
+       }
+
        if (buffer_is_binary(buf, size))
                print_binary_buffer(buf, size);
        else
@@ -273,6 +286,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
-       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+       read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
        ls_tail();
 }