| -rw-r--r-- | ui-tree.c | 51 |
1 files changed, 22 insertions, 29 deletions
@@ -11,11 +11,9 @@ #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; +static int state; static void print_text_buffer(const char *name, char *buf, unsigned long size) { @@ -128,7 +126,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned int mode, int stage, void *cbdata) { - struct walk_tree_context *walk_tree_ctx = cbdata; char *name; char *fullpath; char *class; @@ -156,7 +153,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, cgit_submodule_link("ls-mod", fullpath, 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); + curr_rev, fullpath); } else { class = strrchr(name, '.'); if (class != NULL) { @@ -164,20 +161,19 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, } else class = "ls-blob"; cgit_tree_link(name, NULL, class, ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath); + 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, 0, NULL, NULL, - ctx.qry.showmsg); + 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); if (!S_ISGITLINK(mode)) - cgit_plain_link("plain", NULL, "button", ctx.qry.head, - walk_tree_ctx->curr_rev, fullpath); + cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, + fullpath); html("</td></tr>\n"); free(name); return 0; @@ -199,7 +195,7 @@ static void ls_tail() html("</table>\n"); } -static void ls_tree(const unsigned char *sha1, 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 = { @@ -214,7 +210,7 @@ static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_cont } ls_head(); - read_tree_recursive(tree, "", 0, 1, &paths, ls_item, walk_tree_ctx); + read_tree_recursive(tree, "", 0, 1, &paths, ls_item, NULL); ls_tail(); } @@ -223,25 +219,24 @@ 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 char buffer[PATH_MAX]; - if (walk_tree_ctx->state == 0) { + if (state == 0) { memcpy(buffer, base, baselen); strcpy(buffer + baselen, pathname); - if (strcmp(walk_tree_ctx->match_path, buffer)) + if (strcmp(match_path, buffer)) return READ_TREE_RECURSIVE; if (S_ISDIR(mode)) { - walk_tree_ctx->state = 1; + state = 1; ls_head(); return READ_TREE_RECURSIVE; } else { - print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev); + print_object(sha1, buffer, pathname, curr_rev); return 0; } } - ls_item(sha1, base, baselen, pathname, mode, stage, walk_tree_ctx); + ls_item(sha1, base, baselen, pathname, mode, stage, NULL); return 0; } @@ -263,15 +258,11 @@ void cgit_print_tree(const char *rev, char *path) .nr = path ? 1 : 0, .items = &path_items }; - struct walk_tree_context walk_tree_ctx = { - .match_path = path, - .state = 0 - }; if (!rev) rev = ctx.qry.head; - walk_tree_ctx.curr_rev = xstrdup(rev); + curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { cgit_print_error(fmt("Invalid revision name: %s", rev)); return; @@ -283,11 +274,13 @@ void cgit_print_tree(const char *rev, char *path) } if (path == NULL) { - ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx); + ls_tree(commit->tree->object.sha1, NULL); return; } - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); - if (walk_tree_ctx.state == 1) + match_path = path; + state = 0; + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); + if (state == 1) ls_tail(); } |