1 files changed, 33 insertions, 7 deletions

@@ -89,6 +89,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
         enum object_type type;
         char *buf;
         unsigned long size;
+        int is_binary;
 
         type = oid_object_info(the_repository, oid, &size);
         if (type == OBJ_BAD) {
@@ -103,6 +104,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
                         "Error reading object %s", oid_to_hex(oid));
                 return;
         }
+        is_binary = buffer_is_binary(buf, size);
 
         cgit_set_title_from_path(path);
 
@@ -110,7 +112,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
         htmlf("blob: %s (", oid_to_hex(oid));
         cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                         rev, path);
-        if (ctx.repo->enable_blame) {
+        if (ctx.repo->enable_blame && !is_binary) {
                 html(") (");
                 cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
                                 rev, path);
@@ -123,7 +125,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
                 return;
         }
 
-        if (buffer_is_binary(buf, size))
+        if (is_binary)
                 print_binary_buffer(buf, size);
         else
                 print_text_buffer(basename, buf, size);
@@ -202,9 +204,11 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
         struct walk_tree_context *walk_tree_ctx = cbdata;
         char *name;
         struct strbuf fullpath = STRBUF_INIT;
+        struct strbuf linkpath = STRBUF_INIT;
         struct strbuf class = STRBUF_INIT;
         enum object_type type;
         unsigned long size = 0;
+        char *buf;
 
         name = xstrdup(pathname);
         strbuf_addf(&fullpath, "%s%s%s", ctx.qry.path ? ctx.qry.path : "",
@@ -216,8 +220,7 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
                         htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                               name,
                               oid_to_hex(oid));
-                        free(name);
-                        return 0;
+                        goto cleanup;
                 }
         }
 
@@ -237,22 +240,45 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
                 cgit_tree_link(name, NULL, class.buf, ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
         }
+        if (S_ISLNK(mode)) {
+                html(" -> ");
+                buf = read_object_file(oid, &type, &size);
+                if (!buf) {
+                        htmlf("Error reading object: %s", oid_to_hex(oid));
+                        goto cleanup;
+                }
+                strbuf_addbuf(&linkpath, &fullpath);
+                strbuf_addf(&linkpath, "/../%s", buf);
+                strbuf_normalize_path(&linkpath);
+                cgit_tree_link(buf, NULL, class.buf, ctx.qry.head,
+                        walk_tree_ctx->curr_rev, linkpath.buf);
+                free(buf);
+                strbuf_release(&linkpath);
+        }
         htmlf("</td><td class='ls-size'>%li</td>", size);
 
         html("<td>");
         cgit_log_link("log", NULL, "button", ctx.qry.head,
                       walk_tree_ctx->curr_rev, fullpath.buf, 0, NULL, NULL,
                       ctx.qry.showmsg, 0);
-        if (ctx.repo->max_stats)
+        if (ctx.repo->max_stats) {
+                html(" ");
                 cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                 fullpath.buf);
-        if (!S_ISGITLINK(mode))
+        }
+        if (!S_ISGITLINK(mode)) {
+                html(" ");
                 cgit_plain_link("plain", NULL, "button", ctx.qry.head,
                                 walk_tree_ctx->curr_rev, fullpath.buf);
-        if (!S_ISDIR(mode) && ctx.repo->enable_blame)
+        }
+        if (!S_ISDIR(mode) && ctx.repo->enable_blame) {
+                html(" ");
                 cgit_blame_link("blame", NULL, "button", ctx.qry.head,
                                 walk_tree_ctx->curr_rev, fullpath.buf);
+        }
         html("</td></tr>\n");
+
+cleanup:
         free(name);
         strbuf_release(&fullpath);
         strbuf_release(&class);