author | Lars Hjemli <hjemli@gmail.com> | 2008-05-20 15:56:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-20 15:56:47 (UTC) |
commit | dd7c172542440170b5b1aca8be43d2ad6dae7227 (patch) (unidiff) | |
tree | d991f45be79cec1d3d031bac70413146f593a018 | |
parent | af2e75616d1bfb7dc79d299d10ae0bd39bef47bc (diff) | |
download | cgit-dd7c172542440170b5b1aca8be43d2ad6dae7227.zip cgit-dd7c172542440170b5b1aca8be43d2ad6dae7227.tar.gz cgit-dd7c172542440170b5b1aca8be43d2ad6dae7227.tar.bz2 |
cache.c: fix error checking in print_slot()
The change to print_slot() in cdc6b2f8e7a8d43dcfe0475a9d3498333ea686b8 made
the function return correct errno for read errors while ignoring write errors,
which is not what was intended. This patch tries to rectify things.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cache.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -83,3 +83,3 @@ static int print_slot(struct cache_slot *slot) | |||
83 | { | 83 | { |
84 | ssize_t i; | 84 | ssize_t i, j; |
85 | 85 | ||
@@ -89,6 +89,9 @@ static int print_slot(struct cache_slot *slot) | |||
89 | 89 | ||
90 | while((i = xread(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0) | 90 | do { |
91 | i = xwrite(STDOUT_FILENO, slot->buf, i); | 91 | i = j = xread(slot->cache_fd, slot->buf, sizeof(slot->buf)); |
92 | if (i > 0) | ||
93 | j = xwrite(STDOUT_FILENO, slot->buf, i); | ||
94 | } while (i > 0 && j == i); | ||
92 | 95 | ||
93 | if (i < 0) | 96 | if (i < 0 || j != i) |
94 | return errno; | 97 | return errno; |