1 files changed, 16 insertions, 15 deletions

diff --git a/ui-tree.c b/ui-tree.c
index 9876c99..2a8625c 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -5,73 +5,74 @@
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int header = 0;
 
 static void print_object(const unsigned char *sha1, char *path)
 {
         enum object_type type;
         char *buf;
-        unsigned long size, lineno, start, idx;
-        const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
+        unsigned long size, lineno, idx;
+        const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s",
                                      sha1_to_hex(sha1)));
                 return;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s",
                                      sha1_to_hex(sha1)));
                 return;
         }
 
         html(" (");
         cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                         curr_rev, path);
-        htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
+        htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
         html("<table summary='blob content' class='blob'>\n");
+        html("<tr>\n");
+
+        html("<td class='linenumbers'><pre>");
         idx = 0;
-        start = 0;
         lineno = 0;
-        while(idx < size) {
+        htmlf(numberfmt, ++lineno);
+        while(idx < size - 1) { // skip absolute last newline
                 if (buf[idx] == '\n') {
-                        buf[idx] = '\0';
-                        htmlf(linefmt, ++lineno);
-                        html_txt(buf + start);
-                        html("</td></tr>\n");
-                        start = idx + 1;
+                        htmlf(numberfmt, ++lineno);
                 }
                 idx++;
         }
-        if (start < idx) {
-                htmlf(linefmt, ++lineno);
-                html_txt(buf + start);
-        }
-        html("</td></tr>\n");
+        html("</pre></td>\n");
+
+        html("<td class='lines'><pre><code>");
+        html_txt(buf);
+        html("</code></pre></td>\n");
+
+        html("</tr>\n");
         html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                    const char *pathname, unsigned int mode, int stage,
                    void *cbdata)
 {
         char *name;
         char *fullpath;
         enum object_type type;
         unsigned long size = 0;
 
         name = xstrdup(pathname);
         fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                        ctx.qry.path ? "/" : "", name);