crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-tree.c: Use a context structure in walk_tree()

Browse Source 
Use the context pointer to pass context information instead of misusing
global variables, as we already did in "ui-blob.c" and in "ui-plain.c".

In addition to the fixes to walk_tree(), pass the same structure to
ls_tree() and ls_item() which is read_tree_recursive()-based as well.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-03-03 17:22:30 +01:00 committed by Jason A. Donenfeld
parent bfe5766245
commit 210a5711ad
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ui-tree.c
View File

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