diff options
| -rw-r--r-- | builtin-grep.c | 2 | ||||
| -rw-r--r-- | builtin-pack-objects.c | 2 | ||||
| -rw-r--r-- | merge-tree.c | 9 | ||||
| -rw-r--r-- | tree-walk.c | 6 | ||||
| -rw-r--r-- | tree-walk.h | 1 | ||||
| -rw-r--r-- | tree.c | 9 |
6 files changed, 14 insertions, 15 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 4510d35324..1348cc92ef 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -378,7 +378,7 @@ static int grep_tree(struct grep_opt *opt, const char **paths, * decide if we want to descend into "abc" * directory. */ - strcpy(path_buf + len + entry.pathlen, "/"); + strcpy(path_buf + len + tree_entry_len(entry.path, entry.sha1), "/"); if (!pathspec_matches(paths, down)) ; diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 73d448b890..9231b6564f 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -854,7 +854,7 @@ static void add_pbase_object(struct tree_desc *tree, unsigned long size; enum object_type type; - if (entry.pathlen != cmplen || + if (tree_entry_len(entry.path, entry.sha1) != cmplen || memcmp(entry.path, name, cmplen) || !has_sha1_file(entry.sha1) || (type = sha1_object_info(entry.sha1, &size)) < 0) diff --git a/merge-tree.c b/merge-tree.c index b2867ba722..3b8d9e6887 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -188,7 +188,7 @@ static void resolve(const char *base, struct name_entry *branch1, struct name_en static int unresolved_directory(const char *base, struct name_entry n[3]) { - int baselen; + int baselen, pathlen; char *newbase; struct name_entry *p; struct tree_desc t[3]; @@ -205,10 +205,11 @@ static int unresolved_directory(const char *base, struct name_entry n[3]) if (!S_ISDIR(p->mode)) return 0; baselen = strlen(base); - newbase = xmalloc(baselen + p->pathlen + 2); + pathlen = tree_entry_len(p->path, p->sha1); + newbase = xmalloc(baselen + pathlen + 2); memcpy(newbase, base, baselen); - memcpy(newbase + baselen, p->path, p->pathlen); - memcpy(newbase + baselen + p->pathlen, "/", 2); + memcpy(newbase + baselen, p->path, pathlen); + memcpy(newbase + baselen + pathlen, "/", 2); buf0 = fill_tree_descriptor(t+0, n[0].sha1); buf1 = fill_tree_descriptor(t+1, n[1].sha1); diff --git a/tree-walk.c b/tree-walk.c index a4a4e2a989..1869baede5 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -20,8 +20,8 @@ void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1) static int entry_compare(struct name_entry *a, struct name_entry *b) { return base_name_compare( - a->path, a->pathlen, a->mode, - b->path, b->pathlen, b->mode); + a->path, tree_entry_len(a->path, a->sha1), a->mode, + b->path, tree_entry_len(b->path, b->sha1), b->mode); } static void entry_clear(struct name_entry *a) @@ -32,7 +32,6 @@ static void entry_clear(struct name_entry *a) static void entry_extract(struct tree_desc *t, struct name_entry *a) { a->sha1 = tree_entry_extract(t, &a->path, &a->mode); - a->pathlen = tree_entry_len(a->path, a->sha1); } void update_tree_entry(struct tree_desc *desc) @@ -93,7 +92,6 @@ int tree_entry(struct tree_desc *desc, struct name_entry *entry) entry->path = path; len = strlen(path); - entry->pathlen = len; path += len + 1; entry->sha1 = (const unsigned char *) path; diff --git a/tree-walk.h b/tree-walk.h index a0d7afd89b..149393aaa4 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -10,7 +10,6 @@ struct name_entry { const unsigned char *sha1; const char *path; unsigned int mode; - int pathlen; }; static inline int tree_entry_len(const char *name, const unsigned char *sha1) @@ -101,14 +101,15 @@ int read_tree_recursive(struct tree *tree, if (S_ISDIR(entry.mode)) { int retval; char *newbase; + unsigned int pathlen = tree_entry_len(entry.path, entry.sha1); - newbase = xmalloc(baselen + 1 + entry.pathlen); + newbase = xmalloc(baselen + 1 + pathlen); memcpy(newbase, base, baselen); - memcpy(newbase + baselen, entry.path, entry.pathlen); - newbase[baselen + entry.pathlen] = '/'; + memcpy(newbase + baselen, entry.path, pathlen); + newbase[baselen + pathlen] = '/'; retval = read_tree_recursive(lookup_tree(entry.sha1), newbase, - baselen + entry.pathlen + 1, + baselen + pathlen + 1, stage, match, fn); free(newbase); if (retval) |