git: update to v2.44.0

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 034c4c89474fdb7ecd6e491ab6b0e15f2529834b..064033622355e4a30dce22e5d6d27f1fa38b44ec 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -98,7 +98,7 @@ static void print_object(const struct object_id *oid, const char *path, const ch
                return;
        }
 
                return;
        }
 

-       buf = read_object_file(oid, &type, &size);
+       buf = repo_read_object_file(the_repository, oid, &type, &size);

        if (!buf) {
                cgit_print_error_page(500, "Internal server error",
                        "Error reading object %s", oid_to_hex(oid));
        if (!buf) {
                cgit_print_error_page(500, "Internal server error",
                        "Error reading object %s", oid_to_hex(oid));


@@ -204,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 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;
        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 : "",
 
        name = xstrdup(pathname);
        strbuf_addf(&fullpath, "%s%s%s", ctx.qry.path ? ctx.qry.path : "",


@@ -218,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));
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                              oid_to_hex(oid));

-                       free(name);
-                       return 0;
+                       goto cleanup;

                }
        }
 
                }
        }
 


@@ -239,6 +240,21 @@ 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);
        }
                cgit_tree_link(name, NULL, class.buf, ctx.qry.head,
                               walk_tree_ctx->curr_rev, fullpath.buf);
        }

+       if (S_ISLNK(mode)) {
+               html(" -> ");
+               buf = repo_read_object_file(the_repository, 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>");
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");


@@ -255,6 +271,8 @@ static int ls_item(const struct object_id *oid, struct strbuf *base,
                cgit_blame_link("blame", NULL, "button", ctx.qry.head,
                                walk_tree_ctx->curr_rev, fullpath.buf);
        html("</td></tr>\n");
                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);
        free(name);
        strbuf_release(&fullpath);
        strbuf_release(&class);


@@ -354,13 +372,13 @@ void cgit_print_tree(const char *rev, char *path)
        if (!rev)
                rev = ctx.qry.head;
 
        if (!rev)
                rev = ctx.qry.head;
 

-       if (get_oid(rev, &oid)) {
+       if (repo_get_oid(the_repository, rev, &oid)) {

                cgit_print_error_page(404, "Not found",
                        "Invalid revision name: %s", rev);
                return;
        }
        commit = lookup_commit_reference(the_repository, &oid);
                cgit_print_error_page(404, "Not found",
                        "Invalid revision name: %s", rev);
                return;
        }
        commit = lookup_commit_reference(the_repository, &oid);

-       if (!commit || parse_commit(commit)) {
+       if (!commit || repo_parse_commit(the_repository, commit)) {

                cgit_print_error_page(404, "Not found",
                        "Invalid commit reference: %s", rev);
                return;
                cgit_print_error_page(404, "Not found",
                        "Invalid commit reference: %s", rev);
                return;