mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/read-in-full-stops-on-error'

Browse Source 
* jk/read-in-full-stops-on-error:
  read_in_full: always report errors
This commit is contained in:
Junio C Hamano
2011-05-31 12:08:55 -07:00
parent 2cd517cdd3 56d7c27af1
commit 27c6729201
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wrapper.c
View File

@ -148,8 +148,10 @@ ssize_t read_in_full(int fd, void *buf, size_t count)
while (count > 0) { while (count > 0) {
ssize_t loaded = xread(fd, p, count); ssize_t loaded = xread(fd, p, count);
if (loaded <= 0) if (loaded < 0)
return total ? total : loaded; return -1;
if (loaded == 0)
return total;
count -= loaded; count -= loaded;
p += loaded; p += loaded;
total += loaded; total += loaded;