diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-09-12 01:38:16 +0400 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-09-12 01:38:16 +0400 |
commit | 412293dcc95369f0a42ae9a94f30fe7328a5491c (patch) | |
tree | 200d4bb5fa8cc3f8f037486e2128479048b8384e /src/blob.c | |
parent | 5a409c44baf2c7c2bd36fb8e8c2d5b2ce5b1908b (diff) | |
parent | c859184bb459d9801a394dc44f5b0b0e55453263 (diff) |
Merge branch 'diff-crlf-filters' into development
Diffstat (limited to 'src/blob.c')
-rw-r--r-- | src/blob.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/blob.c b/src/blob.c index 5a4a26bfa..a5a0b6dde 100644 --- a/src/blob.c +++ b/src/blob.c @@ -68,6 +68,7 @@ static int write_file_stream( int fd, error; char buffer[4096]; git_odb_stream *stream = NULL; + ssize_t read_len, written = 0; if ((error = git_odb_open_wstream( &stream, odb, (size_t)file_size, GIT_OBJ_BLOB)) < 0) @@ -78,20 +79,18 @@ static int write_file_stream( return -1; } - while (!error && file_size > 0) { - ssize_t read_len = p_read(fd, buffer, sizeof(buffer)); - - if (read_len < 0) { - giterr_set( - GITERR_OS, "Failed to create blob. Can't read whole file"); - error = -1; - } - else if (!(error = stream->write(stream, buffer, read_len))) - file_size -= read_len; + while (!error && (read_len = p_read(fd, buffer, sizeof(buffer))) > 0) { + error = stream->write(stream, buffer, read_len); + written += read_len; } p_close(fd); + if (written != file_size || read_len < 0) { + giterr_set(GITERR_OS, "Failed to read file into stream"); + error = -1; + } + if (!error) error = stream->finalize_write(oid, stream); |