diff options
| author | Jeff King <peff@peff.net> | 2017-09-27 02:02:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-27 15:45:24 +0900 |
| commit | 41dcc4dcccecca49e3f75212ce9e614ffe2bdcc8 (patch) | |
| tree | 1511cf57f1762ba21bc920a85239063a16e7de91 /bulk-checkin.c | |
| parent | 90dca6710e6e5aad5d78d0cd006c3adadb65524d (diff) | |
| download | git-41dcc4dcccecca49e3f75212ce9e614ffe2bdcc8.tar.gz | |
distinguish error versus short read from read_in_full()
Many callers of read_in_full() expect to see the exact
number of bytes requested, but their error handling lumps
together true read errors and short reads due to unexpected
EOF.
We can give more specific error messages by separating these
cases (showing errno when appropriate, and otherwise
describing the short read).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 9a1f6c49ab..3310fd210a 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -115,7 +115,10 @@ static int stream_to_pack(struct bulk_checkin_state *state, if (size && !s.avail_in) { ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf); - if (read_in_full(fd, ibuf, rsize) != rsize) + ssize_t read_result = read_in_full(fd, ibuf, rsize); + if (read_result < 0) + die_errno("failed to read from '%s'", path); + if (read_result != rsize) die("failed to read %d bytes from '%s'", (int)rsize, path); offset += rsize; |