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

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

@@ -46 +46 @@
 
 
-/* Called twice: once at startup (LZMA_FAST only) and once in rc_normalize() */
-static size_inline void rc_read(rc_t *rc)
+/* Called once in rc_do_normalize() */
+static void rc_read(rc_t *rc)
 {
     int buffer_size = safe_read(rc->fd, RC_BUFFER, RC_BUFFER_SIZE);
@@ -54 +54 @@
     if (buffer_size <= 0)
         bb_error_msg_and_die("unexpected EOF");
+    rc->buffer_end = RC_BUFFER + buffer_size;
     rc->ptr = RC_BUFFER;
-    rc->buffer_end = RC_BUFFER + buffer_size;
 }
 
@@ -66 +66 @@
     rc->code = (rc->code << 8) | *rc->ptr++;
 }
+static ALWAYS_INLINE void rc_normalize(rc_t *rc)
+{
+    if (rc->range < (1 << RC_TOP_BITS)) {
+        rc_do_normalize(rc);
+    }
+}
 
 /* Called once */
@@ -79 +85 @@
 
     for (i = 0; i < 5; i++) {
-#if ENABLE_FEATURE_LZMA_FAST
-        if (rc->ptr >= rc->buffer_end)
-            rc_read(rc);
-        rc->code = (rc->code << 8) | *rc->ptr++;
-#else
         rc_do_normalize(rc);
-#endif
-    }
-    rc->range = 0xFFFFFFFF;
+    }
+    rc->range = 0xffffffff;
     return rc;
 }
@@ -95 +95 @@
 {
     free(rc);
-}
-
-static ALWAYS_INLINE void rc_normalize(rc_t *rc)
-{
-    if (rc->range < (1 << RC_TOP_BITS)) {
-        rc_do_normalize(rc);
-    }
 }
 
@@ -121 +114 @@
 
 /* Called 4 times in unlzma loop */
-static speed_inline int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
+static ALWAYS_INLINE int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
 {
     int ret = rc_is_bit_1(rc, p);
@@ -214 +207 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst_fd)
+unpack_lzma_stream(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -222 +215 @@
     uint32_t literal_pos_mask;
     uint16_t *p;
-    int num_bits;
-    int num_probs;
     rc_t *rc;
     int i;
@@ -233 +224 @@
     uint32_t rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
 
-    if (full_read(src_fd, &header, sizeof(header)) != sizeof(header)
+    if (full_read(xstate->src_fd, &header, sizeof(header)) != sizeof(header)
      || header.pos >= (9 * 5 * 5)
     ) {
@@ -247 +238 @@
     literal_pos_mask = (1 << lp) - 1;
 
+    /* Example values from linux-3.3.4.tar.lzma:
+     * dict_size: 64M, dst_size: 2^64-1
+     */
     header.dict_size = SWAP_LE32(header.dict_size);
     header.dst_size = SWAP_LE64(header.dst_size);
@@ -255 +249 @@
     buffer = xmalloc(MIN(header.dst_size, header.dict_size));
 
-    num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
-    p = xmalloc(num_probs * sizeof(*p));
-    num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
-    for (i = 0; i < num_probs; i++)
-        p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
-
-    rc = rc_init(src_fd); /*, RC_BUFFER_SIZE); */
+    {
+        int num_probs;
+
+        num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
+        p = xmalloc(num_probs * sizeof(*p));
+        num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
+        for (i = 0; i < num_probs; i++)
+            p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
+    }
+
+    rc = rc_init(xstate->src_fd); /*, RC_BUFFER_SIZE); */
 
     while (global_pos + buffer_pos < header.dst_size) {
@@ -309 +307 @@
                 buffer_pos = 0;
                 global_pos += header.dict_size;
-                if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size)
+                if (transformer_write(xstate, buffer, header.dict_size) != (ssize_t)header.dict_size)
                     goto bad;
                 IF_DESKTOP(total_written += header.dict_size;)
@@ -318 +316 @@
 #endif
         } else {
+            int num_bits;
             int offset;
             uint16_t *prob2;
@@ -442 +441 @@
                     buffer_pos = 0;
                     global_pos += header.dict_size;
-                    if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size)
+                    if (transformer_write(xstate, buffer, header.dict_size) != (ssize_t)header.dict_size)
                         goto bad;
                     IF_DESKTOP(total_written += header.dict_size;)
@@ -448 +447 @@
                 len--;
             } while (len != 0 && buffer_pos < header.dst_size);
+            /* FIXME: ...........^^^^^
+             * shouldn't it be "global_pos + buffer_pos < header.dst_size"?
+             */
         }
     }
@@ -454 +456 @@
         IF_NOT_DESKTOP(int total_written = 0; /* success */)
         IF_DESKTOP(total_written += buffer_pos;)
-        if (full_write(dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) {
+        if (transformer_write(xstate, buffer, buffer_pos) != (ssize_t)buffer_pos) {
  bad:
             total_written = -1; /* failure */