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

* jk/read-in-full-stops-on-error: read_in_full: always report errors
git-mirror · May 31, 2011 · 27c6729 · 27c6729
2 parents 2cd517c + 56d7c27
commit 27c6729
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/wrapper.c b/wrapper.c
@@ -148,8 +148,10 @@ ssize_t read_in_full(int fd, void *buf, size_t count)
 
 	while (count > 0) {
 		ssize_t loaded = xread(fd, p, count);
-		if (loaded <= 0)
-			return total ? total : loaded;
+		if (loaded < 0)
+			return -1;
+		if (loaded == 0)
+			return total;
 		count -= loaded;
 		p += loaded;
 		total += loaded;