Merge pull request #3174 from libgit2/cmn/idx-fill-hole

indexer: use lseek to extend the packfile
This commit is contained in:
Edward Thomson 2015-06-10 16:43:48 -04:00
commit 3e8c5e45cb

View File

@ -478,13 +478,14 @@ static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t
static int append_to_pack(git_indexer *idx, const void *data, size_t size) static int append_to_pack(git_indexer *idx, const void *data, size_t size)
{ {
git_off_t current_size = idx->pack->mwf.size; git_off_t current_size = idx->pack->mwf.size;
int fd = idx->pack->mwf.fd;
if (!size) if (!size)
return 0; return 0;
/* add the extra space we need at the end */ if (p_lseek(fd, current_size + size - 1, SEEK_SET) < 0 ||
if (p_ftruncate(idx->pack->mwf.fd, current_size + size) < 0) { p_write(idx->pack->mwf.fd, data, 1) < 0) {
giterr_set(GITERR_OS, "Failed to increase size of pack file '%s'", idx->pack->pack_name); giterr_set(GITERR_OS, "cannot extend packfile '%s'", idx->pack->pack_name);
return -1; return -1;
} }