aboutsummaryrefslogtreecommitdiffstats
path: root/ui-blob.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-blob.c')
-rw-r--r--ui-blob.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-blob.c b/ui-blob.c
index c2de8d6..a025bca 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -18,15 +18,15 @@ struct walk_tree_context {
18 int file_only:1; 18 int file_only:1;
19}; 19};
20 20
21static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 21static int walk_tree(const unsigned char *sha1, struct strbuf *base,
22 const char *pathname, unsigned mode, int stage, void *cbdata) 22 const char *pathname, unsigned mode, int stage, void *cbdata)
23{ 23{
24 struct walk_tree_context *walk_tree_ctx = cbdata; 24 struct walk_tree_context *walk_tree_ctx = cbdata;
25 25
26 if (walk_tree_ctx->file_only && !S_ISREG(mode)) 26 if (walk_tree_ctx->file_only && !S_ISREG(mode))
27 return READ_TREE_RECURSIVE; 27 return READ_TREE_RECURSIVE;
28 if (strncmp(base, walk_tree_ctx->match_path, baselen) 28 if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
29 || strcmp(walk_tree_ctx->match_path + baselen, pathname)) 29 || strcmp(walk_tree_ctx->match_path + base->len, pathname))
30 return READ_TREE_RECURSIVE; 30 return READ_TREE_RECURSIVE;
31 memmove(walk_tree_ctx->matched_sha1, sha1, 20); 31 memmove(walk_tree_ctx->matched_sha1, sha1, 20);
32 walk_tree_ctx->found_path = 1; 32 walk_tree_ctx->found_path = 1;