Diffstat (limited to 'ui-tree.c')
| -rw-r--r-- | ui-tree.c | 316 |
1 files changed, 100 insertions, 216 deletions
@@ -1,28 +1,25 @@ /* ui-tree.c: functions for tree output * - * Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com> + * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ - #define USE_THE_REPOSITORY_VARIABLE - +#include <ctype.h> #include "cgit.h" -#include "ui-tree.h" #include "html.h" #include "ui-shared.h" -struct walk_tree_context { - char *curr_rev; - char *match_path; - int state; -}; +char *curr_rev; +char *match_path; +int header = 0; static void print_text_buffer(const char *name, char *buf, unsigned long size) { unsigned long lineno, idx; - const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n"; + const char *numberfmt = + "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; html("<table summary='blob content' class='blob'>\n"); @@ -30,10 +27,10 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) html("<tr><td class='linenumbers'><pre>"); idx = 0; lineno = 0; - + if (size) { htmlf(numberfmt, ++lineno); - while (idx < size - 1) { // skip absolute last newline + while(idx < size - 1) { // skip absolute last newline if (buf[idx] == '\n') htmlf(numberfmt, ++lineno); idx++; @@ -46,12 +43,11 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) } if (ctx.repo->source_filter) { - char *filter_arg = xstrdup(name); html("<td class='lines'><pre><code>"); - cgit_open_filter(ctx.repo->source_filter, filter_arg); - html_raw(buf, size); + ctx.repo->source_filter->argv[1] = xstrdup(name); + cgit_open_filter(ctx.repo->source_filter); + write(STDOUT_FILENO, buf, size); cgit_close_filter(ctx.repo->source_filter); - free(filter_arg); html("</code></pre></td></tr></table>\n"); return; } @@ -71,7 +67,7 @@ static void print_binary_buffer(char *buf, unsigned long size) 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 += ROWLEN, buf += ROWLEN) { - htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs); + htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs); for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) htmlf("%*s%02x", idx == 16 ? 4 : 1, "", @@ -86,143 +82,65 @@ static void print_binary_buffer(char *buf, unsigned long size) html("</table>\n"); } -static void print_object(const struct object_id *oid, const char *path, const char *basename, const char *rev) +static void print_object(const unsigned char *sha1, char *path, const char *basename) { enum object_type type; char *buf; unsigned long size; - bool is_binary; - type = odb_read_object_info(the_repository->objects, oid, &size); + type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { - cgit_print_error_page(404, "Not found", - "Bad object name: %s", oid_to_hex(oid)); + cgit_print_error(fmt("Bad object name: %s", + sha1_to_hex(sha1))); return; } - buf = odb_read_object(the_repository->objects, oid, &type, &size); + buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error_page(500, "Internal server error", - "Error reading object %s", oid_to_hex(oid)); + cgit_print_error(fmt("Error reading object %s", + sha1_to_hex(sha1))); return; } - is_binary = buffer_is_binary(buf, size); - - cgit_set_title_from_path(path); - cgit_print_layout_start(); - htmlf("blob: %s (", oid_to_hex(oid)); + html(" ("); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, - rev, path); - if (ctx.repo->enable_blame && !is_binary) { - html(") ("); - cgit_blame_link("blame", NULL, NULL, ctx.qry.head, - rev, path); - } - html(")\n"); + curr_rev, path); + htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { - htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>", + htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", size / 1024, ctx.cfg.max_blob_size); return; } - if (is_binary) + if (buffer_is_binary(buf, size)) print_binary_buffer(buf, size); else print_text_buffer(basename, buf, size); - - free(buf); } -struct single_tree_ctx { - struct strbuf *path; - struct object_id oid; - char *name; - size_t count; -}; - -static int single_tree_cb(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, 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); - oidcpy(&ctx->oid, oid); - strbuf_addf(ctx->path, "/%s", pathname); - return 0; -} - -static void write_tree_link(const struct object_id *oid, char *name, - char *rev, struct strbuf *fullpath) +static int ls_item(const unsigned char *sha1, const char *base, int baselen, + const char *pathname, unsigned int mode, int stage, + void *cbdata) { - size_t initial_length = fullpath->len; - struct tree *tree; - struct single_tree_ctx tree_ctx = { - .path = fullpath, - .count = 1, - }; - struct pathspec paths = { - .nr = 0 - }; - - oidcpy(&tree_ctx.oid, oid); - - while (tree_ctx.count == 1) { - cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev, - fullpath->buf); - - tree = lookup_tree(the_repository, &tree_ctx.oid); - if (!tree) - return; - - free(tree_ctx.name); - tree_ctx.name = NULL; - tree_ctx.count = 0; - - read_tree(the_repository, tree, &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 struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *cbdata) -{ - 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; + char *fullpath; + char *class; 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 : "", - ctx.qry.path ? "/" : "", name); + fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", + ctx.qry.path ? "/" : "", name); if (!S_ISGITLINK(mode)) { - type = odb_read_object_info(the_repository->objects, oid, &size); + type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", name, - oid_to_hex(oid)); - goto cleanup; + sha1_to_hex(sha1)); + return 0; } } @@ -230,60 +148,40 @@ static int ls_item(const struct object_id *oid, struct strbuf *base, cgit_print_filemode(mode); html("</td><td>"); if (S_ISGITLINK(mode)) { - cgit_submodule_link("ls-mod", fullpath.buf, oid_to_hex(oid)); + htmlf("<a class='ls-mod' href='"); + html_attr(fmt(ctx.repo->module_link, + name, + sha1_to_hex(sha1))); + html("'>"); + html_txt(name); + html("</a>"); } else if (S_ISDIR(mode)) { - write_tree_link(oid, name, walk_tree_ctx->curr_rev, - &fullpath); + cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, + curr_rev, fullpath); } else { - char *ext = strrchr(name, '.'); - strbuf_addstr(&class, "ls-blob"); - if (ext) - strbuf_addf(&class, " %s", ext + 1); - cgit_tree_link(name, NULL, class.buf, ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath.buf); - } - if (S_ISLNK(mode)) { - html(" -> "); - buf = odb_read_object(the_repository->objects, 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); + 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); 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); + cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, + fullpath, 0, NULL, NULL, ctx.qry.showmsg); if (ctx.repo->max_stats) cgit_stats_link("stats", NULL, "button", ctx.qry.head, - fullpath.buf); - if (!S_ISGITLINK(mode)) - cgit_plain_link("plain", NULL, "button", ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath.buf); - if (!S_ISDIR(mode) && ctx.repo->enable_blame) - cgit_blame_link("blame", NULL, "button", ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath.buf); + fullpath); html("</td></tr>\n"); - -cleanup: free(name); - strbuf_release(&fullpath); - strbuf_release(&class); return 0; } -static void ls_head(void) +static void ls_head() { - cgit_print_layout_start(); html("<table summary='tree listing' class='list'>\n"); html("<tr class='nohover'>"); html("<th class='left'>Mode</th>"); @@ -291,64 +189,68 @@ static void ls_head(void) html("<th class='right'>Size</th>"); html("<th/>"); html("</tr>\n"); + header = 1; } -static void ls_tail(void) +static void ls_tail() { + if (!header) + return; html("</table>\n"); - cgit_print_layout_end(); + header = 0; } -static void ls_tree(const struct object_id *oid, const char *path, struct walk_tree_context *walk_tree_ctx) +static void ls_tree(const unsigned char *sha1, char *path) { struct tree *tree; - struct pathspec paths = { - .nr = 0 - }; - tree = parse_tree_indirect(oid); + tree = parse_tree_indirect(sha1); if (!tree) { - cgit_print_error_page(404, "Not found", - "Not a tree object: %s", oid_to_hex(oid)); + cgit_print_error(fmt("Not a tree object: %s", + sha1_to_hex(sha1))); return; } ls_head(); - read_tree(the_repository, tree, &paths, ls_item, walk_tree_ctx); + read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); ls_tail(); } -static int walk_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *cbdata) +static int walk_tree(const unsigned char *sha1, const char *base, int baselen, + const char *pathname, unsigned mode, int stage, + void *cbdata) { - struct walk_tree_context *walk_tree_ctx = cbdata; + static int state; + static char buffer[PATH_MAX]; + char *url; - if (walk_tree_ctx->state == 0) { - struct strbuf buffer = STRBUF_INIT; + if (state == 0) { + memcpy(buffer, base, baselen); + strcpy(buffer+baselen, pathname); + url = cgit_pageurl(ctx.qry.repo, "tree", + fmt("h=%s&path=%s", curr_rev, buffer)); + html("/"); + cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, + curr_rev, buffer); - strbuf_addbuf(&buffer, base); - strbuf_addstr(&buffer, pathname); - if (strcmp(walk_tree_ctx->match_path, buffer.buf)) + if (strcmp(match_path, buffer)) return READ_TREE_RECURSIVE; if (S_ISDIR(mode)) { - walk_tree_ctx->state = 1; - cgit_set_title_from_path(buffer.buf); - strbuf_release(&buffer); + state = 1; ls_head(); return READ_TREE_RECURSIVE; } else { - walk_tree_ctx->state = 2; - print_object(oid, buffer.buf, pathname, walk_tree_ctx->curr_rev); - strbuf_release(&buffer); + print_object(sha1, buffer, pathname); return 0; } } - ls_item(oid, base, pathname, mode, walk_tree_ctx); + ls_item(sha1, base, baselen, pathname, mode, stage, NULL); return 0; } + /* * Show a tree or a blob * rev: the commit pointing at the root tree object @@ -356,52 +258,34 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base, */ void cgit_print_tree(const char *rev, char *path) { - struct object_id oid; + unsigned char sha1[20]; struct commit *commit; - struct pathspec_item path_items = { - .match = path, - .len = path ? strlen(path) : 0 - }; - struct pathspec paths = { - .nr = path ? 1 : 0, - .items = &path_items - }; - struct walk_tree_context walk_tree_ctx = { - .match_path = path, - .state = 0 - }; + const char *paths[] = {path, NULL}; if (!rev) rev = ctx.qry.head; - if (repo_get_oid(the_repository, rev, &oid)) { - cgit_print_error_page(404, "Not found", - "Invalid revision name: %s", rev); + curr_rev = xstrdup(rev); + if (get_sha1(rev, sha1)) { + cgit_print_error(fmt("Invalid revision name: %s", rev)); return; } - commit = lookup_commit_reference(the_repository, &oid); - if (!commit || repo_parse_commit(the_repository, commit)) { - cgit_print_error_page(404, "Not found", - "Invalid commit reference: %s", rev); + commit = lookup_commit_reference(sha1); + if (!commit || parse_commit(commit)) { + cgit_print_error(fmt("Invalid commit reference: %s", rev)); return; } - walk_tree_ctx.curr_rev = xstrdup(rev); + html("path: <a href='"); + html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); + html("'>root</a>"); if (path == NULL) { - ls_tree(get_commit_tree_oid(commit), NULL, &walk_tree_ctx); - goto cleanup; + ls_tree(commit->tree->object.sha1, NULL); + return; } - read_tree(the_repository, repo_get_commit_tree(the_repository, commit), - &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); + match_path = path; + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); + ls_tail(); } |