Skip to content

Commit

Permalink
Loop on write() calls in gzwrite.c in case of non-blocking I/O.
Browse files Browse the repository at this point in the history
  • Loading branch information
madler committed Apr 5, 2016
1 parent 4423fef commit 4f1df00
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions gzwrite.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,15 @@ local int gz_comp(state, flush)

/* write directly if requested */
if (state->direct) {
got = write(state->fd, strm->next_in, strm->avail_in);
if (got < 0 || (unsigned)got != strm->avail_in) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
while (strm->avail_in) {
got = write(state->fd, strm->next_in, strm->avail_in);
if (got < 0) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
}
strm->avail_in -= got;
strm->next_in += got;
}
strm->avail_in = 0;
return 0;
}

Expand All @@ -98,17 +101,19 @@ local int gz_comp(state, flush)
doing Z_FINISH then don't write until we get to Z_STREAM_END */
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
(flush != Z_FINISH || ret == Z_STREAM_END))) {
have = (unsigned)(strm->next_out - state->x.next);
if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
(unsigned)got != have)) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
while (strm->next_out > state->x.next) {
got = write(state->fd, state->x.next,
strm->next_out - state->x.next);
if (got < 0) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
}
state->x.next += got;
}
if (strm->avail_out == 0) {
strm->avail_out = state->size;
strm->next_out = state->out;
}
state->x.next = strm->next_out;
}

/* compress */
Expand Down

0 comments on commit 4f1df00

Please sign in to comment.