diff options
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | clone-pack.c | 5 | ||||
| -rw-r--r-- | sha1_file.c | 19 |
3 files changed, 25 insertions, 1 deletions
@@ -161,6 +161,8 @@ extern void rollback_index_file(struct cache_file *); extern char *git_path(const char *fmt, ...); extern char *sha1_file_name(const unsigned char *sha1); +int safe_create_leading_directories(char *path); + /* Read and unpack a sha1 file into memory, write memory to a sha1 file */ extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size); extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size); diff --git a/clone-pack.c b/clone-pack.c index 0337ceccc4..b9b8437dd5 100644 --- a/clone-pack.c +++ b/clone-pack.c @@ -68,9 +68,12 @@ static int is_master(struct ref *ref) static void write_one_ref(struct ref *ref) { char *path = git_path(ref->name); - int fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0666); + int fd; char *hex; + if (safe_create_leading_directories(path)) + die("unable to create leading directory for %s", ref->name); + fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0666); if (fd < 0) die("unable to create ref %s", ref->name); hex = sha1_to_hex(ref->sha1); diff --git a/sha1_file.c b/sha1_file.c index 1747276647..fd6096f417 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -130,6 +130,25 @@ char *git_path(const char *fmt, ...) return ret; } +int safe_create_leading_directories(char *path) +{ + char *pos = path; + + while (pos) { + pos = strchr(pos, '/'); + if (!pos) + break; + *pos = 0; + if (mkdir(path, 0777) < 0) + if (errno != EEXIST) { + *pos = '/'; + return -1; + } + *pos++ = '/'; + } + return 0; +} + int get_sha1(const char *str, unsigned char *sha1) { static const char *prefix[] = { |