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)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/libarchive/decompress_unxz.c (modified) (4 diffs)

branches/3.3/mindi-busybox/archival/libarchive/decompress_unxz.c

@@ -39 +39 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_xz_stream(transformer_state_t *xstate)
 {
     enum xz_ret xz_result;
@@ -56 +56 @@
     iobuf.out_size = BUFSIZ;
 
-    if (!aux || aux->check_signature == 0) {
+    if (!xstate || xstate->signature_skipped) {
         /* Preload XZ file signature */
         strcpy((char*)membuf, HEADER_MAGIC);
@@ -68 +68 @@
     while (1) {
         if (iobuf.in_pos == iobuf.in_size) {
-            int rd = safe_read(src_fd, membuf, BUFSIZ);
+            int rd = safe_read(xstate->src_fd, membuf, BUFSIZ);
             if (rd < 0) {
                 bb_error_msg(bb_msg_read_error);
@@ -105 +105 @@
 //              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
         if (iobuf.out_pos) {
-            xwrite(dst_fd, iobuf.out, iobuf.out_pos);
+            xtransformer_write(xstate, iobuf.out, iobuf.out_pos);
             IF_DESKTOP(total += iobuf.out_pos;)
             iobuf.out_pos = 0;