Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/decompress_unxz.c
- Timestamp:
- Dec 20, 2016, 4:07:32 PM (7 years ago)
- Location:
- branches/3.3
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/mindi-busybox/archival/libarchive/decompress_unxz.c
r3232 r3621 39 39 40 40 IF_DESKTOP(long long) int FAST_FUNC 41 unpack_xz_stream(transformer_ aux_data_t *aux, int src_fd, int dst_fd)41 unpack_xz_stream(transformer_state_t *xstate) 42 42 { 43 43 enum xz_ret xz_result; … … 56 56 iobuf.out_size = BUFSIZ; 57 57 58 if (! aux || aux->check_signature == 0) {58 if (!xstate || xstate->signature_skipped) { 59 59 /* Preload XZ file signature */ 60 60 strcpy((char*)membuf, HEADER_MAGIC); … … 68 68 while (1) { 69 69 if (iobuf.in_pos == iobuf.in_size) { 70 int rd = safe_read( src_fd, membuf, BUFSIZ);70 int rd = safe_read(xstate->src_fd, membuf, BUFSIZ); 71 71 if (rd < 0) { 72 72 bb_error_msg(bb_msg_read_error); … … 105 105 // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result); 106 106 if (iobuf.out_pos) { 107 x write(dst_fd, iobuf.out, iobuf.out_pos);107 xtransformer_write(xstate, iobuf.out, iobuf.out_pos); 108 108 IF_DESKTOP(total += iobuf.out_pos;) 109 109 iobuf.out_pos = 0;
Note:
See TracChangeset
for help on using the changeset viewer.