Commit c6ba8a37 by Linquize

Can read large file larger than 2GB on Windows

parent 59403f1f
......@@ -151,15 +151,14 @@ int p_rename(const char *from, const char *to)
#endif /* GIT_WIN32 */
int p_read(git_file fd, void *buf, size_t cnt)
ssize_t p_read(git_file fd, void *buf, size_t cnt)
{
char *b = buf;
while (cnt) {
ssize_t r;
#ifdef GIT_WIN32
assert((size_t)((unsigned int)cnt) == cnt);
r = read(fd, b, (unsigned int)cnt);
r = read(fd, b, cnt > INT_MAX ? INT_MAX : (unsigned int)cnt);
#else
r = read(fd, b, cnt);
#endif
......@@ -173,7 +172,7 @@ int p_read(git_file fd, void *buf, size_t cnt)
cnt -= r;
b += r;
}
return (int)(b - (char *)buf);
return (b - (char *)buf);
}
int p_write(git_file fd, const void *buf, size_t cnt)
......
......@@ -97,7 +97,7 @@ typedef int git_file;
* Use your manpages to check the docs on these.
*/
extern int p_read(git_file fd, void *buf, size_t cnt);
extern ssize_t p_read(git_file fd, void *buf, size_t cnt);
extern int p_write(git_file fd, const void *buf, size_t cnt);
#define p_close(fd) close(fd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment