From a64bf21bbb5f79d3ac523087a2953a35adbb896f Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 15 Jun 2011 16:05:33 +0200 Subject: [PATCH] blob: Fix git_blob_create_fromfile() --- src/blob.c | 4 ++-- src/fileops.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blob.c b/src/blob.c index c95d018e2..ceb2c9c44 100644 --- a/src/blob.c +++ b/src/blob.c @@ -119,9 +119,9 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat ssize_t read_len; if (!islnk) - read_len = gitfo_read(fd, buffer, sizeof(buffer)); + read_len = gitfo_read(fd, buffer, (size_t)(size < sizeof(buffer) ? size : sizeof(buffer))); else - read_len = gitfo_readlink(full_path, buffer, sizeof(buffer)); + read_len = gitfo_readlink(full_path, buffer, (size_t)size); if (read_len < 0) { if (!islnk) diff --git a/src/fileops.c b/src/fileops.c index 2a78764c6..2136c913e 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -97,7 +97,7 @@ int gitfo_read(git_file fd, void *buf, size_t cnt) cnt -= r; b += r; } - return GIT_SUCCESS; + return (int)(b - (char *)buf); } int gitfo_write(git_file fd, void *buf, size_t cnt)