Switch "read_tree_recursive()" over to tree-walk functionality

[git.git] / tree.c

diff --git a/tree.c b/tree.c
index 1e76d9c..88f8fd5 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -8,7 +8,7 @@
 
 const char *tree_type = "tree";
 
-static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
+static int read_one_entry(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
        int len;
        unsigned int size;
@@ -78,19 +78,26 @@ int read_tree_recursive(struct tree *tree,
                        int stage, const char **match,
                        read_tree_fn_t fn)
 {
-       struct tree_entry_list *list;
+       struct tree_desc desc;
+
        if (parse_tree(tree))
                return -1;
-       list = tree->entries;
-       while (list) {
-               struct tree_entry_list *current = list;
-               list = list->next;
-               if (!match_tree_entry(base, baselen, current->name,
-                                     current->mode, match))
+
+       desc.buf = tree->buffer;
+       desc.size = tree->size;
+
+       while (desc.size) {
+               unsigned mode;
+               const char *name;
+               const unsigned char *sha1;
+
+               sha1 = tree_entry_extract(&desc, &name, &mode);
+               update_tree_entry(&desc);
+
+               if (!match_tree_entry(base, baselen, name, mode, match))
                        continue;
 
-               switch (fn(current->item.any->sha1, base, baselen,
-                          current->name, current->mode, stage)) {
+               switch (fn(sha1, base, baselen, name, mode, stage)) {
                case 0:
                        continue;
                case READ_TREE_RECURSIVE:
@@ -98,16 +105,16 @@ int read_tree_recursive(struct tree *tree,
                default:
                        return -1;
                }
-               if (current->directory) {
+               if (S_ISDIR(mode)) {
                        int retval;
-                       int pathlen = strlen(current->name);
+                       int pathlen = strlen(name);
                        char *newbase;
 
                        newbase = xmalloc(baselen + 1 + pathlen);
                        memcpy(newbase, base, baselen);
-                       memcpy(newbase + baselen, current->name, pathlen);
+                       memcpy(newbase + baselen, name, pathlen);
                        newbase[baselen + pathlen] = '/';
-                       retval = read_tree_recursive(current->item.tree,
+                       retval = read_tree_recursive(lookup_tree(sha1),
                                                     newbase,
                                                     baselen + pathlen + 1,
                                                     stage, match, fn);
@@ -170,6 +177,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
 
                entry = xmalloc(sizeof(struct tree_entry_list));
                entry->name = path;
+               entry->sha1 = sha1;
                entry->mode = mode;
                entry->directory = S_ISDIR(mode) != 0;
                entry->executable = (mode & S_IXUSR) != 0;
@@ -178,12 +186,6 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
                entry->next = NULL;
 
                update_tree_entry(&desc);
-
-               if (entry->directory) {
-                       entry->item.tree = lookup_tree(sha1);
-               } else {
-                       entry->item.blob = lookup_blob(sha1);
-               }
                n_refs++;
                *list_p = entry;
                list_p = &entry->next;
@@ -193,8 +195,16 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
                struct tree_entry_list *entry;
                unsigned i = 0;
                struct object_refs *refs = alloc_object_refs(n_refs);
-               for (entry = item->entries; entry; entry = entry->next)
-                       refs->ref[i++] = entry->item.any;
+               for (entry = item->entries; entry; entry = entry->next) {
+                       struct object *obj;
+
+                       if (entry->directory)
+                               obj = &lookup_tree(entry->sha1)->object;
+                       else
+                               obj = &lookup_blob(entry->sha1)->object;
+                       refs->ref[i++] = obj;
+               }
+
                set_object_refs(&item->object, refs);
        }