Merge branch 'lh/mimetypes'

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index a37a4e59c56f1bfcbe057bb7dde74abfe272e146..61fcf5a0776433a3a129a8fa805f7ab2ce11ff6f 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -25,11 +25,14 @@ static void print_text_buffer(char *buf, unsigned long size)
        html("<tr><td class='linenumbers'><pre>");
        idx = 0;
        lineno = 0;
-       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");
        html("<td class='lines'><pre><code>");
@@ -37,21 +40,26 @@ static void print_text_buffer(char *buf, unsigned long size)
        html("</code></pre></td></tr></table>\n");
 }
 
+#define ROWLEN 32
+
 static void print_binary_buffer(char *buf, unsigned long size)
 {
        unsigned long ofs, idx;
+       static char ascii[ROWLEN + 1];
 
        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 += 32, buf += 32) {
+       for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
                htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
-               for (idx = 0; idx < 32 && ofs + idx < size; idx++)
+               for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                        htmlf("%*s%02x",
                              idx == 16 ? 4 : 1, "",
                              buf[idx] & 0xff);
                html(" </td><td class='hex'>");
-               for (idx = 0; idx < 32 && ofs + idx < size; idx++)
-                       htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.');
+               for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
+                       ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
+               ascii[idx] = '\0';
+               html_txt(ascii);
                html("</td></tr>\n");
        }
        html("</table>\n");
@@ -95,6 +103,7 @@ 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;
 
@@ -127,7 +136,12 @@ 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 {
-               cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
+               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,
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);