git-svn: Eliminate temp file usage in libsvn_get_file()

diff --git a/fetch.c b/fetch.c
index cc6013e7afb4479f325cf20bb22684246ead8022..cf6c99490c234c5854146f8f6e72d8c615517eea 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -3,6 +3,7 @@
 #include "cache.h"
 #include "commit.h"
 #include "tree.h"
+#include "tree-walk.h"
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
@@ -37,21 +38,33 @@ static int process(struct object *obj);
 
 static int process_tree(struct tree *tree)
 {
-       struct tree_entry_list *entry;
+       struct tree_desc desc;
+       struct name_entry entry;
 
        if (parse_tree(tree))
                return -1;
 
-       entry = tree->entries;
-       tree->entries = NULL;
-       while (entry) {
-               struct tree_entry_list *next = entry->next;
-               if (process(entry->item.any))
+       desc.buf = tree->buffer;
+       desc.size = tree->size;
+       while (tree_entry(&desc, &entry)) {
+               struct object *obj = NULL;
+
+               if (S_ISDIR(entry.mode)) {
+                       struct tree *tree = lookup_tree(entry.sha1);
+                       if (tree)
+                               obj = &tree->object;
+               }
+               else {
+                       struct blob *blob = lookup_blob(entry.sha1);
+                       if (blob)
+                               obj = &blob->object;
+               }
+               if (!obj || process(obj))
                        return -1;
-               free(entry->name);
-               free(entry);
-               entry = next;
        }
+       free(tree->buffer);
+       tree->buffer = NULL;
+       tree->size = 0;
        return 0;
 }
 
@@ -137,7 +150,8 @@ static int process(struct object *obj)
        if (has_sha1_file(obj->sha1)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
-       } else {
+       }
+       else {
                if (obj->flags & COMPLETE)
                        return 0;
                prefetch(obj->sha1);
@@ -242,7 +256,8 @@ int pull(char *target)
                if (write_ref_log_details) {
                        msg = xmalloc(strlen(write_ref_log_details) + 12);
                        sprintf(msg, "fetch from %s", write_ref_log_details);
-               } else
+               }
+               else
                        msg = NULL;
                ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
                if (msg)