Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/decompress_uncompress.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_uncompress.c (modified) (6 diffs)

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

@@ -74 +74 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_Z_stream(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -103 +103 @@
     int block_mode; /* = BLOCK_MODE; */
 
-    if (check_signature16(aux, src_fd, COMPRESS_MAGIC))
+    if (check_signature16(xstate, COMPRESS_MAGIC))
         return -1;
 
@@ -115 +115 @@
     /* xread isn't good here, we have to return - caller may want
      * to do some cleanup (e.g. delete incomplete unpacked file etc) */
-    if (full_read(src_fd, inbuf, 1) != 1) {
+    if (full_read(xstate->src_fd, inbuf, 1) != 1) {
         bb_error_msg("short read");
         goto err;
@@ -167 +167 @@
 
         if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
-            rsize = safe_read(src_fd, inbuf + insize, IBUFSIZ);
+            rsize = safe_read(xstate->src_fd, inbuf + insize, IBUFSIZ);
             if (rsize < 0)
                 bb_error_msg_and_die(bb_msg_read_error);
@@ -275 +275 @@
 
                         if (outpos >= OBUFSIZ) {
-                            xwrite(dst_fd, outbuf, outpos);
+                            xtransformer_write(xstate, outbuf, outpos);
                             IF_DESKTOP(total_written += outpos;)
                             outpos = 0;
@@ -298 +298 @@
             oldcode = incode;
         }
-
     } while (rsize > 0);
 
     if (outpos > 0) {
-        xwrite(dst_fd, outbuf, outpos);
+        xtransformer_write(xstate, outbuf, outpos);
         IF_DESKTOP(total_written += outpos;)
     }