diff options
Diffstat (limited to 'local-fetch.c')
| -rw-r--r-- | local-fetch.c | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/local-fetch.c b/local-fetch.c index 8176532..0dbed89 100644 --- a/local-fetch.c +++ b/local-fetch.c @@ -38,6 +38,8 @@ static int setup_indices(void) unsigned char sha1[20]; sprintf(filename, "%s/objects/pack/", path); dir = opendir(filename); + if (!dir) + return -1; while ((de = readdir(dir)) != NULL) { int namelen = strlen(de->d_name); if (namelen != 50 || @@ -46,10 +48,12 @@ static int setup_indices(void) get_sha1_hex(de->d_name + 5, sha1); setup_index(sha1); } + closedir(dir); return 0; } -static int copy_file(const char *source, const char *dest, const char *hex) +static int copy_file(const char *source, const char *dest, const char *hex, + int warn_if_not_exists) { if (use_link) { if (!link(source, dest)) { @@ -58,13 +62,24 @@ static int copy_file(const char *source, const char *dest, const char *hex) } /* If we got ENOENT there is no point continuing. */ if (errno == ENOENT) { - fprintf(stderr, "does not exist %s\n", source); + if (warn_if_not_exists) + fprintf(stderr, "does not exist %s\n", source); return -1; } } - if (use_symlink && !symlink(source, dest)) { - pull_say("symlink %s\n", hex); - return 0; + if (use_symlink) { + struct stat st; + if (stat(source, &st)) { + if (!warn_if_not_exists && errno == ENOENT) + return -1; + fprintf(stderr, "cannot stat %s: %s\n", source, + strerror(errno)); + return -1; + } + if (!symlink(source, dest)) { + pull_say("symlink %s\n", hex); + return 0; + } } if (use_filecopy) { int ifd, ofd, status; @@ -72,7 +87,11 @@ static int copy_file(const char *source, const char *dest, const char *hex) void *map; ifd = open(source, O_RDONLY); if (ifd < 0 || fstat(ifd, &st) < 0) { - close(ifd); + int err = errno; + if (ifd >= 0) + close(ifd); + if (!warn_if_not_exists && err == ENOENT) + return -1; fprintf(stderr, "cannot open %s\n", source); return -1; } @@ -86,7 +105,8 @@ static int copy_file(const char *source, const char *dest, const char *hex) status = ((ofd < 0) || (write(ofd, map, st.st_size) != st.st_size)); munmap(map, st.st_size); - close(ofd); + if (ofd >= 0) + close(ofd); if (status) fprintf(stderr, "cannot write %s\n", dest); else @@ -116,11 +136,11 @@ static int fetch_pack(const unsigned char *sha1) sprintf(filename, "%s/objects/pack/pack-%s.pack", path, sha1_to_hex(target->sha1)); copy_file(filename, sha1_pack_name(target->sha1), - sha1_to_hex(target->sha1)); + sha1_to_hex(target->sha1), 1); sprintf(filename, "%s/objects/pack/pack-%s.idx", path, sha1_to_hex(target->sha1)); copy_file(filename, sha1_pack_index_name(target->sha1), - sha1_to_hex(target->sha1)); + sha1_to_hex(target->sha1), 1); install_packed_git(target); return 0; } @@ -141,7 +161,7 @@ static int fetch_file(const unsigned char *sha1) filename[object_name_start+1] = hex[1]; filename[object_name_start+2] = '/'; strcpy(filename + object_name_start + 3, hex + 2); - return copy_file(filename, dest_filename, hex); + return copy_file(filename, dest_filename, hex, 0); } int fetch(unsigned char *sha1) |