X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=9aec97fa73d4e6bd2354988536af8826dbb9ed04;hb=f864ba7448564d06e8076d1b6a66eca00a337d8c;hp=efd8d36141fa10cba27f370ec3a66e1b05af8bc6;hpb=83adac3c57ad8cd2c8d44b525414b949950e316d;p=git.git

diff --git a/read-tree.c b/read-tree.c
index efd8d361..9aec97fa 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -5,22 +5,23 @@
  */
 #include "cache.h"
 
-static int read_one_entry(unsigned char *sha1, const char *pathname, unsigned mode)
+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(len);
+	unsigned int size = cache_entry_size(baselen + len);
 	struct cache_entry *ce = malloc(size);
 
 	memset(ce, 0, size);
 
 	ce->st_mode = mode;
-	ce->namelen = len;
-	memcpy(ce->name, pathname, len+1);
+	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);
+	return add_cache_entry(ce, 1);
 }
 
-static int read_tree(unsigned char *sha1)
+static int read_tree(unsigned char *sha1, const char *base, int baselen)
 {
 	void *buffer;
 	unsigned long size;
@@ -43,49 +44,63 @@ static int read_tree(unsigned char *sha1)
 		buffer = sha1 + 20;
 		size -= len + 20;
 
-		if (read_one_entry(sha1, path, mode) < 0)
+		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;
 }
 
+static int remove_lock = 0;
+
+static void remove_lock_file(void)
+{
+	if (remove_lock)
+		unlink(".git/index.lock");
+}
+
 int main(int argc, char **argv)
 {
 	int i, newfd;
 	unsigned char sha1[20];
 
-	newfd = open(".dircache/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
+	newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
 	if (newfd < 0)
-		usage("unable to create new cachefile");
+		die("unable to create new cachefile");
+	atexit(remove_lock_file);
+	remove_lock = 1;
 
 	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;
-			}
+			if (active_cache)
+				die("read-tree: cannot merge old cache on top of new");
+			if (read_cache() < 0)
+				die("read-tree: corrupt directory cache");
 			continue;
 		}
-		if (get_sha1_hex(arg, sha1) < 0) {
-			fprintf(stderr, "read-tree [-m] <sha1>\n");
-			goto out;
-		}
-		if (read_tree(sha1) < 0) {
-			fprintf(stderr, "failed to unpack tree object %s\n", arg);
-			goto out;
-		}
+		if (get_sha1_hex(arg, sha1) < 0)
+			usage("read-tree [-m] <sha1>");
+		if (read_tree(sha1, "", 0) < 0)
+			die("failed to unpack tree object %s", arg);
 	}
-	if (!write_cache(newfd, active_cache, active_nr) && !rename(".dircache/index.lock", ".dircache/index"))
-		return 0;
-
-out:
-	unlink(".dircache/index.lock");
-	exit(1);
+	if (write_cache(newfd, active_cache, active_nr) ||
+	    rename(".git/index.lock", ".git/index"))
+		die("unable to write new index file");
+	remove_lock = 0;
+	return 0;
 }