Fix diff-tree recursion.

diff --git a/read-tree.c b/read-tree.c
index 997343e133b42a08059584766e2737632c9c044e..5784802e945e43612cbc5415681e9e08dc1cf1df 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -5,7 +5,23 @@
  */
 #include "cache.h"
 
-static int unpack(unsigned char *sha1)
+static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode)
+{
+       int len = strlen(pathname);
+       unsigned int size = cache_entry_size(baselen + len);
+       struct cache_entry *ce = malloc(size);
+
+       memset(ce, 0, size);
+
+       ce->st_mode = mode;
+       ce->namelen = baselen + len;
+       memcpy(ce->name, base, baselen);
+       memcpy(ce->name + baselen, pathname, len+1);
+       memcpy(ce->sha1, sha1, 20);
+       return add_cache_entry(ce, 1);
+}
+
+static int read_tree(unsigned char *sha1, const char *base, int baselen)
 {
        void *buffer;
        unsigned long size;
@@ -13,36 +29,77 @@ static int unpack(unsigned char *sha1)
 
        buffer = read_sha1_file(sha1, type, &size);
        if (!buffer)
-               usage("unable to read sha1 file");
+               return -1;
        if (strcmp(type, "tree"))
-               usage("expected a 'tree' node");
+               return -1;
        while (size) {
                int len = strlen(buffer)+1;
                unsigned char *sha1 = buffer + len;
                char *path = strchr(buffer, ' ')+1;
                unsigned int mode;
+
                if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
-                       usage("corrupt 'tree' file");
+                       return -1;
+
                buffer = sha1 + 20;
                size -= len + 20;
-               printf("%o %s (%s)\n", mode, path, sha1_to_hex(sha1));
+
+               if (S_ISDIR(mode)) {
+                       int retval;
+                       int pathlen = strlen(path);
+                       char *newbase = malloc(baselen + 1 + pathlen);
+                       memcpy(newbase, base, baselen);
+                       memcpy(newbase + baselen, path, pathlen);
+                       newbase[baselen + pathlen] = '/';
+                       retval = read_tree(sha1, newbase, baselen + pathlen + 1);
+                       free(newbase);
+                       if (retval)
+                               return -1;
+                       continue;
+               }
+               if (read_one_entry(sha1, base, baselen, path, mode) < 0)
+                       return -1;
        }
        return 0;
 }
 
 int main(int argc, char **argv)
 {
-       int fd;
+       int i, newfd;
        unsigned char sha1[20];
 
-       if (argc != 2)
-               usage("read-tree <key>");
-       if (get_sha1_hex(argv[1], sha1) < 0)
-               usage("read-tree <key>");
-       sha1_file_directory = getenv(DB_ENVIRONMENT);
-       if (!sha1_file_directory)
-               sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
-       if (unpack(sha1) < 0)
-               usage("unpack failed");
-       return 0;
+       newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
+       if (newfd < 0)
+               usage("unable to create new cachefile");
+
+       for (i = 1; i < argc; i++) {
+               const char *arg = argv[i];
+
+               /* "-m" stands for "merge" current directory cache */
+               if (!strcmp(arg, "-m")) {
+                       if (active_cache) {
+                               fprintf(stderr, "read-tree: cannot merge old cache on top of new\n");
+                               goto out;
+                       }
+                       if (read_cache() < 0) {
+                               fprintf(stderr, "read-tree: corrupt directory cache\n");
+                               goto out;
+                       }
+                       continue;
+               }
+               if (get_sha1_hex(arg, sha1) < 0) {
+                       fprintf(stderr, "read-tree [-m] <sha1>\n");
+                       goto out;
+               }
+               if (read_tree(sha1, "", 0) < 0) {
+                       fprintf(stderr, "failed to unpack tree object %s\n", arg);
+                       goto out;
+               }
+       }
+       if (!write_cache(newfd, active_cache, active_nr) && !rename(".dircache/index.lock", ".dircache/index"))
+               return 0;
+
+out:
+       unlink(".dircache/index.lock");
+       exit(1);
 }