X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/7105a78b17b118866aee77735e26cffcd1fd08fd..9dd3c5e93c5af3d35efe6e9f844456eb0f27a819:/ui-tree.c diff --git a/ui-tree.c b/ui-tree.c index 2dbe89e..b310242 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -84,6 +84,37 @@ static void print_binary_buffer(char *buf, unsigned long size) html("\n"); } +static void set_title_from_path(const char *path) +{ + size_t path_len, path_index, path_last_end; + char *new_title; + + if (!path) + return; + + path_len = strlen(path); + new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1); + new_title[0] = '\0'; + + for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) { + if (path[path_index] == '/') { + if (path_index == path_len - 1) { + path_last_end = path_index - 1; + continue; + } + strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1); + strcat(new_title, "\\"); + path_last_end = path_index; + } + } + if (path_last_end) + strncat(new_title, path, path_last_end); + + strcat(new_title, " - "); + strcat(new_title, ctx.page.title); + ctx.page.title = new_title; +} + static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev) { enum object_type type; @@ -92,16 +123,21 @@ static void print_object(const unsigned char *sha1, char *path, const char *base type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { - cgit_print_error("Bad object name: %s", sha1_to_hex(sha1)); + cgit_print_error_page(404, "Not found", + "Bad object name: %s", sha1_to_hex(sha1)); return; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error("Error reading object %s", sha1_to_hex(sha1)); + cgit_print_error_page(500, "Internal server error", + "Error reading object %s", sha1_to_hex(sha1)); return; } + set_title_from_path(path); + + cgit_print_layout_start(); htmlf("blob: %s (", sha1_to_hex(sha1)); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, rev, path); @@ -119,6 +155,72 @@ static void print_object(const unsigned char *sha1, char *path, const char *base print_text_buffer(basename, buf, size); } +struct single_tree_ctx { + struct strbuf *path; + unsigned char sha1[GIT_SHA1_RAWSZ]; + char *name; + size_t count; +}; + +static int single_tree_cb(const unsigned char *sha1, struct strbuf *base, + const char *pathname, unsigned mode, int stage, + void *cbdata) +{ + struct single_tree_ctx *ctx = cbdata; + + if (++ctx->count > 1) + return -1; + + if (!S_ISDIR(mode)) { + ctx->count = 2; + return -1; + } + + ctx->name = xstrdup(pathname); + hashcpy(ctx->sha1, sha1); + strbuf_addf(ctx->path, "/%s", pathname); + return 0; +} + +static void write_tree_link(const unsigned char *sha1, char *name, + char *rev, struct strbuf *fullpath) +{ + size_t initial_length = fullpath->len; + struct tree *tree; + struct single_tree_ctx tree_ctx = { + .path = fullpath, + .count = 1, + }; + struct pathspec paths = { + .nr = 0 + }; + + hashcpy(tree_ctx.sha1, sha1); + + while (tree_ctx.count == 1) { + cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev, + fullpath->buf); + + tree = lookup_tree(tree_ctx.sha1); + if (!tree) + return; + + free(tree_ctx.name); + tree_ctx.name = NULL; + tree_ctx.count = 0; + + read_tree_recursive(tree, "", 0, 1, &paths, single_tree_cb, + &tree_ctx); + + if (tree_ctx.count != 1) + break; + + html(" / "); + name = tree_ctx.name; + } + + strbuf_setlen(fullpath, initial_length); +} static int ls_item(const unsigned char *sha1, struct strbuf *base, const char *pathname, unsigned mode, int stage, void *cbdata) @@ -140,6 +242,7 @@ static int ls_item(const unsigned char *sha1, struct strbuf *base, htmlf("Bad object: %s %s", name, sha1_to_hex(sha1)); + free(name); return 0; } } @@ -150,8 +253,8 @@ static int ls_item(const unsigned char *sha1, struct strbuf *base, if (S_ISGITLINK(mode)) { cgit_submodule_link("ls-mod", fullpath.buf, sha1_to_hex(sha1)); } else if (S_ISDIR(mode)) { - cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath.buf); + write_tree_link(sha1, name, walk_tree_ctx->curr_rev, + &fullpath); } else { char *ext = strrchr(name, '.'); strbuf_addstr(&class, "ls-blob"); @@ -181,6 +284,7 @@ static int ls_item(const unsigned char *sha1, struct strbuf *base, static void ls_head(void) { + cgit_print_layout_start(); html("\n"); html(""); html(""); @@ -193,6 +297,7 @@ static void ls_head(void) static void ls_tail(void) { html("
Mode
\n"); + cgit_print_layout_end(); } static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_context *walk_tree_ctx) @@ -204,7 +309,8 @@ static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_cont tree = parse_tree_indirect(sha1); if (!tree) { - cgit_print_error("Not a tree object: %s", sha1_to_hex(sha1)); + cgit_print_error_page(404, "Not found", + "Not a tree object: %s", sha1_to_hex(sha1)); return; } @@ -218,20 +324,25 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, const char *pathname, unsigned mode, int stage, void *cbdata) { struct walk_tree_context *walk_tree_ctx = cbdata; - static char buffer[PATH_MAX]; if (walk_tree_ctx->state == 0) { - memcpy(buffer, base->buf, base->len); - strcpy(buffer + base->len, pathname); - if (strcmp(walk_tree_ctx->match_path, buffer)) + struct strbuf buffer = STRBUF_INIT; + + strbuf_addbuf(&buffer, base); + strbuf_addstr(&buffer, pathname); + if (strcmp(walk_tree_ctx->match_path, buffer.buf)) return READ_TREE_RECURSIVE; if (S_ISDIR(mode)) { walk_tree_ctx->state = 1; + set_title_from_path(buffer.buf); + strbuf_release(&buffer); ls_head(); return READ_TREE_RECURSIVE; } else { - print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev); + walk_tree_ctx->state = 2; + print_object(sha1, buffer.buf, pathname, walk_tree_ctx->curr_rev); + strbuf_release(&buffer); return 0; } } @@ -246,7 +357,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, */ void cgit_print_tree(const char *rev, char *path) { - unsigned char sha1[20]; + struct object_id oid; struct commit *commit; struct pathspec_item path_items = { .match = path, @@ -264,26 +375,32 @@ void cgit_print_tree(const char *rev, char *path) if (!rev) rev = ctx.qry.head; - if (get_sha1(rev, sha1)) { - cgit_print_error("Invalid revision name: %s", rev); + if (get_oid(rev, &oid)) { + cgit_print_error_page(404, "Not found", + "Invalid revision name: %s", rev); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit || parse_commit(commit)) { - cgit_print_error("Invalid commit reference: %s", rev); + cgit_print_error_page(404, "Not found", + "Invalid commit reference: %s", rev); return; } walk_tree_ctx.curr_rev = xstrdup(rev); if (path == NULL) { - ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx); + ls_tree(commit->tree->object.oid.hash, NULL, &walk_tree_ctx); goto cleanup; } read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); if (walk_tree_ctx.state == 1) ls_tail(); + else if (walk_tree_ctx.state == 2) + cgit_print_layout_end(); + else + cgit_print_error_page(404, "Not found", "Path not found"); cleanup: free(walk_tree_ctx.curr_rev);