Browse Source

Merge branch 'js/xread-in-full' into maint

* js/xread-in-full:
  stream_to_pack: xread does not guarantee to read all requested bytes
maint
Jonathan Nieder 12 years ago
parent
commit
be5e85016f
  1. 2
      bulk-checkin.c

2
bulk-checkin.c

@ -114,7 +114,7 @@ static int stream_to_pack(struct bulk_checkin_state *state, @@ -114,7 +114,7 @@ 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 (xread(fd, ibuf, rsize) != rsize)
if (read_in_full(fd, ibuf, rsize) != rsize)
die("failed to read %d bytes from '%s'",
(int)rsize, path);
offset += rsize;

Loading…
Cancel
Save