X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=checkout-cache.c;h=cfbc47ee2db059092fc432865269b82943dfa084;hb=d6d3f9d0125a7215f3cdc2600b2307ca55b69536;hp=1b50da8f1a8107d81a005b025df971e8a497f940;hpb=f7391ce3bd306c5731bc8206f8a0fa0947ca9474;p=git.git

diff --git a/checkout-cache.c b/checkout-cache.c
index 1b50da8f..cfbc47ee 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -36,20 +36,49 @@
 
 static int force = 0, quiet = 0;
 
+static void create_directories(const char *path)
+{
+	int len = strlen(path);
+	char *buf = malloc(len + 1);
+	const char *slash = path;
+
+	while ((slash = strchr(slash+1, '/')) != NULL) {
+		len = slash - path;
+		memcpy(buf, path, len);
+		buf[len] = 0;
+		mkdir(buf, 0700);
+	}
+}
+
+static int create_file(const char *path, unsigned int mode)
+{
+	int fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+	if (fd < 0) {
+		if (errno == ENOENT) {
+			create_directories(path);
+			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+		}
+	}
+	if (fd >= 0)
+		fchmod(fd, mode);
+	return fd;
+}
+
 static int write_entry(struct cache_entry *ce)
 {
 	int fd;
 	void *new;
 	unsigned long size;
 	long wrote;
+	char type[20];
 
-	new = read_sha1_file(ce->sha1, "blob", &size);
-	if (!new) {
+	new = read_sha1_file(ce->sha1, type, &size);
+	if (!new || strcmp(type, "blob")) {
 		fprintf(stderr, "checkout-cache: unable to read sha1 file of %s (%s)\n",
 			ce->name, sha1_to_hex(ce->sha1));
 		return -1;
 	}
-	fd = open(ce->name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	fd = create_file(ce->name, ce->st_mode);
 	if (fd < 0) {
 		fprintf(stderr, "checkout-cache: unable to create %s (%s)\n",
 			ce->name, strerror(errno));