diff options
Diffstat (limited to 'archival/libunarchive/decompress_bunzip2.c')
| -rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 4b611b833..0164b77e0 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c | |||
| @@ -1548,7 +1548,7 @@ extern ssize_t read_bz2(int fd, void *buf, size_t count) | |||
| 1548 | 1548 | ||
| 1549 | while (1) { | 1549 | while (1) { |
| 1550 | if (bzf->strm.avail_in == 0) { | 1550 | if (bzf->strm.avail_in == 0) { |
| 1551 | n = xread(bzf->fd, bzf->buf, BZ_MAX_UNUSED); | 1551 | n = bb_xread(bzf->fd, bzf->buf, BZ_MAX_UNUSED); |
| 1552 | if (n == 0) { | 1552 | if (n == 0) { |
| 1553 | break; | 1553 | break; |
| 1554 | } | 1554 | } |
| @@ -1560,7 +1560,7 @@ extern ssize_t read_bz2(int fd, void *buf, size_t count) | |||
| 1560 | ret = BZ2_bzDecompress(&(bzf->strm)); | 1560 | ret = BZ2_bzDecompress(&(bzf->strm)); |
| 1561 | 1561 | ||
| 1562 | if ((ret != BZ_OK) && (ret != BZ_STREAM_END)) { | 1562 | if ((ret != BZ_OK) && (ret != BZ_STREAM_END)) { |
| 1563 | error_msg_and_die("Error decompressing"); | 1563 | bb_error_msg_and_die("Error decompressing"); |
| 1564 | } | 1564 | } |
| 1565 | 1565 | ||
| 1566 | if (ret == BZ_STREAM_END) { | 1566 | if (ret == BZ_STREAM_END) { |
| @@ -1628,12 +1628,12 @@ extern unsigned char uncompressStream(int src_fd, int dst_fd) | |||
| 1628 | while (bzerr == BZ_OK) { | 1628 | while (bzerr == BZ_OK) { |
| 1629 | nread = read_bz2(src_fd, obuf, 5000); | 1629 | nread = read_bz2(src_fd, obuf, 5000); |
| 1630 | if (bzerr == BZ_DATA_ERROR_MAGIC) { | 1630 | if (bzerr == BZ_DATA_ERROR_MAGIC) { |
| 1631 | error_msg_and_die("invalid magic"); | 1631 | bb_error_msg_and_die("invalid magic"); |
| 1632 | } | 1632 | } |
| 1633 | if (((bzerr == BZ_OK) || (bzerr == BZ_STREAM_END)) && (nread > 0)) { | 1633 | if (((bzerr == BZ_OK) || (bzerr == BZ_STREAM_END)) && (nread > 0)) { |
| 1634 | if (write(dst_fd, obuf, nread) != nread) { | 1634 | if (write(dst_fd, obuf, nread) != nread) { |
| 1635 | BZ2_bzReadClose(); | 1635 | BZ2_bzReadClose(); |
| 1636 | perror_msg_and_die("Couldnt write to file"); | 1636 | bb_perror_msg_and_die("Couldnt write to file"); |
| 1637 | } | 1637 | } |
| 1638 | } | 1638 | } |
| 1639 | } | 1639 | } |