| -rw-r--r-- | ui-tree.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -324,25 +324,22 @@ 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) { - struct strbuf buffer = STRBUF_INIT; - - strbuf_addbuf(&buffer, base); - strbuf_addstr(&buffer, pathname); - if (strcmp(walk_tree_ctx->match_path, buffer.buf)) + memcpy(buffer, base->buf, base->len); + strcpy(buffer + base->len, pathname); + if (strcmp(walk_tree_ctx->match_path, buffer)) return READ_TREE_RECURSIVE; if (S_ISDIR(mode)) { walk_tree_ctx->state = 1; - set_title_from_path(buffer.buf); - strbuf_release(&buffer); + set_title_from_path(buffer); ls_head(); return READ_TREE_RECURSIVE; } else { walk_tree_ctx->state = 2; - print_object(sha1, buffer.buf, pathname, walk_tree_ctx->curr_rev); - strbuf_release(&buffer); + print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev); return 0; } } |