proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 08:11:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #269 from schu/infinite-append

Browse Source 
gitfo_read: fix read-loop
This commit is contained in:
Vicent Martí 2011-06-21 13:53:48 -07:00
commit 3bf3ad9f03
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileops.c
View File

@ -90,10 +90,8 @@ int gitfo_read(git_file fd, void *buf, size_t cnt)
continue; continue;
return git__throw(GIT_EOSERR, "Failed to read from file"); return git__throw(GIT_EOSERR, "Failed to read from file");
} }
if (!r) { if (!r)
errno = EPIPE; break;
return git__throw(GIT_EOSERR, "Failed to read from file");
}
cnt -= r; cnt -= r;
b += r; b += r;
} }

18
tests/t00-core.c
View File

@ -675,6 +675,23 @@ BEGIN_TEST(filebuf0, "make sure git_filebuf_open doesn't delete an existing lock
must_pass(gitfo_unlink(testlock)); must_pass(gitfo_unlink(testlock));
END_TEST END_TEST
BEGIN_TEST(filebuf1, "make sure GIT_FILEBUF_APPEND works as expected")
git_filebuf file;
int fd;
char test[] = "test";
fd = gitfo_creat(test, 0644);
must_pass(fd);
must_pass(gitfo_write(fd, "libgit2 rocks\n", 14));
must_pass(gitfo_close(fd));
must_pass(git_filebuf_open(&file, test, GIT_FILEBUF_APPEND));
must_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks"));
must_pass(git_filebuf_commit(&file));
must_pass(gitfo_unlink(test));
END_TEST
BEGIN_SUITE(core) BEGIN_SUITE(core)
ADD_TEST(string0); ADD_TEST(string0);
ADD_TEST(string1); ADD_TEST(string1);
@ -698,4 +715,5 @@ BEGIN_SUITE(core)
ADD_TEST(dirent4); ADD_TEST(dirent4);
ADD_TEST(filebuf0); ADD_TEST(filebuf0);
ADD_TEST(filebuf1);
END_SUITE END_SUITE