Diffstat (limited to 'ui-tree.c')
| -rw-r--r-- | ui-tree.c | 53 |
1 files changed, 15 insertions, 38 deletions
@@ -15,43 +15,26 @@ char *curr_rev; char *match_path; int header = 0; -static void print_text_buffer(const char *name, char *buf, unsigned long size) +static void print_text_buffer(char *buf, unsigned long size) { unsigned long lineno, idx; const char *numberfmt = "<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"); + html("<tr><td class='linenumbers'><pre>"); + idx = 0; + lineno = 0; - 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++; - } + 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("<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); - cgit_close_filter(ctx.repo->source_filter); - html("</code></pre></td></tr></table>\n"); - return; - } - + html("</pre></td>\n"); html("<td class='lines'><pre><code>"); html_txt(buf); html("</code></pre></td></tr></table>\n"); @@ -82,7 +65,7 @@ static void print_binary_buffer(char *buf, unsigned long size) html("</table>\n"); } -static void print_object(const unsigned char *sha1, char *path, const char *basename) +static void print_object(const unsigned char *sha1, char *path) { enum object_type type; char *buf; @@ -110,7 +93,7 @@ static void print_object(const unsigned char *sha1, char *path, const char *base if (buffer_is_binary(buf, size)) print_binary_buffer(buf, size); else - print_text_buffer(basename, buf, size); + print_text_buffer(buf, size); } @@ -120,7 +103,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, { char *name; char *fullpath; - char *class; enum object_type type; unsigned long size = 0; @@ -153,12 +135,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, curr_rev, fullpath); } else { - class = strrchr(name, '.'); - if (class != NULL) { - class = fmt("ls-blob %s", class + 1); - } else - class = "ls-blob"; - cgit_tree_link(name, NULL, class, ctx.qry.head, + cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, curr_rev, fullpath); } htmlf("</td><td class='ls-size'>%li</td>", size); @@ -236,7 +213,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, ls_head(); return READ_TREE_RECURSIVE; } else { - print_object(sha1, buffer, pathname); + print_object(sha1, buffer); return 0; } } |