Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/unxz

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/unxz/README (modified) (3 diffs)
• mindi-busybox/archival/libarchive/unxz/xz.h (modified) (5 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_bcj.c (modified) (3 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_lzma2.c (modified) (5 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_stream.c (modified) (2 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_stream.h (modified) (2 diffs)

branches/3.3/mindi-busybox/archival/libarchive/unxz/README

@@ -8 +8 @@
     XZ Embedded was written for use in the Linux kernel, but the code can
     be easily used in other environments too, including regular userspace
-    applications.
+    applications. See userspace/xzminidec.c for an example program.
 
     This README contains information that is useful only when the copy
@@ -56 +56 @@
     care than just using 32-bit integer instead of 64-bit).
 
-    If you use GCC, try to use a recent version. For example, on x86,
+    If you use GCC, try to use a recent version. For example, on x86-32,
     xz_dec_lzma2.c compiled with GCC 3.3.6 is 15-25 % slower than when
     compiled with GCC 4.3.3.
@@ -94 +94 @@
 
         #define             Instruction set     BCJ filter endianness
-        XZ_DEC_X86          x86 or x86-64       Little endian only
+        XZ_DEC_X86          x86-32 or x86-64    Little endian only
         XZ_DEC_POWERPC      PowerPC             Big endian only
         XZ_DEC_IA64         Itanium (IA-64)     Big or little endian

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz.h

@@ -18 +18 @@
 #   include <stddef.h>
 #   include <stdint.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
@@ -71 +75 @@
  *                          is still possible in multi-call mode by simply
  *                          calling xz_dec_run() again.
- *                          NOTE: This return value is used only if
+ *                          Note that this return value is used only if
  *                          XZ_DEC_ANY_CHECK was defined at build time,
  *                          which is not used in the kernel. Unsupported
@@ -106 +110 @@
  *
  * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small, or the compressed input is corrupt in a way that makes the
+ * is too small or the compressed input is corrupt in a way that makes the
  * decoder produce more output than the caller expected. When it is
  * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
@@ -208 +212 @@
  * See enum xz_ret for details.
  *
- * NOTE: If an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified, and the
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
  * contents of the output buffer from b->out[b->out_pos] onward are
  * undefined. This is true even after XZ_BUF_ERROR, because with some filter
@@ -269 +273 @@
         const uint8_t *buf, size_t size, uint32_t crc);
 #endif
-#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_bcj.c

@@ -78 +78 @@
 #ifdef XZ_DEC_X86
 /*
- * This is macro used to test the most significant byte of a memory address
+ * This is used to test the most significant byte of a memory address
  * in an x86 instruction.
  */
-#define bcj_x86_test_msbyte(b) ((b) == 0x00 || (b) == 0xFF)
+static inline int bcj_x86_test_msbyte(uint8_t b)
+{
+    return b == 0x00 || b == 0xFF;
+}
 
 static noinline_for_stack size_t XZ_FUNC bcj_x86(
@@ -444 +447 @@
      * in the output buffer. If everything cannot be filtered, copy it
      * to temp and rewind the output buffer position accordingly.
+     *
+     * This needs to be always run when temp.size == 0 to handle a special
+     * case where the output buffer is full and the next filter has no
+     * more output coming but hasn't returned XZ_STREAM_END yet.
      */
-    if (s->temp.size < b->out_size - b->out_pos) {
+    if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) {
         out_start = b->out_pos;
         memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
@@ -468 +475 @@
         b->out_pos -= s->temp.size;
         memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+
+        /*
+         * If there wasn't enough input to the next filter to fill
+         * the output buffer with unfiltered data, there's no point
+         * to try decoding more data to temp.
+         */
+        if (b->out_pos + s->temp.size < b->out_size)
+            return XZ_OK;
     }
 
     /*
-     * If we have unfiltered data in temp, try to fill by decoding more
-     * data from the next filter. Apply the BCJ filter on temp. Then we
-     * hopefully can fill the actual output buffer by copying filtered
-     * data from temp. A mix of filtered and unfiltered data may be left
-     * in temp; it will be taken care on the next call to this function.
+     * We have unfiltered data in temp. If the output buffer isn't full
+     * yet, try to fill the temp buffer by decoding more data from the
+     * next filter. Apply the BCJ filter on temp. Then we hopefully can
+     * fill the actual output buffer by copying filtered data from temp.
+     * A mix of filtered and unfiltered data may be left in temp; it will
+     * be taken care on the next call to this function.
      */
-    if (s->temp.size > 0) {
+    if (b->out_pos < b->out_size) {
         /* Make b->out{,_pos,_size} temporarily point to s->temp. */
         s->out = b->out;

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_lzma2.c

@@ -408 +408 @@
         b->out_pos += copy_size;
         b->in_pos += copy_size;
-
     }
 }
@@ -973 +972 @@
             tmp = b->in[b->in_pos++];
 
+            if (tmp == 0x00)
+                return XZ_STREAM_END;
+
             if (tmp >= 0xE0 || tmp == 0x01) {
                 s->lzma2.need_props = true;
@@ -994 +996 @@
                     s->lzma2.next_sequence
                             = SEQ_PROPERTIES;
-
                 } else if (s->lzma2.need_props) {
                     return XZ_DATA_ERROR;
-
                 } else {
                     s->lzma2.next_sequence
@@ -1005 +1005 @@
                 }
             } else {
-                if (tmp == 0x00)
-                    return XZ_STREAM_END;
-
                 if (tmp > 0x02)
                     return XZ_DATA_ERROR;
@@ -1082 +1079 @@
                 rc_reset(&s->rc);
                 s->lzma2.sequence = SEQ_CONTROL;
-
             } else if (b->out_pos == b->out_size
                     || (b->in_pos == b->in_size

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_stream.c

@@ -354 +354 @@
 
         s->pos += 8;
-
     } while (s->pos < 32);
 
@@ -754 +753 @@
             b->out_pos = out_start;
         }
-
     } else if (ret == XZ_OK && in_start == b->in_pos
             && out_start == b->out_pos) {

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_stream.h

@@ -26 +26 @@
 #define STREAM_HEADER_SIZE 12
 
-#define HEADER_MAGIC "\3757zXZ\0"
+#define HEADER_MAGIC "\3757zXZ"
 #define HEADER_MAGIC_SIZE 6
 
@@ -33 +33 @@
 
 /*
- * Variable-length integer can hold a 63-bit unsigned integer, or a special
- * value to indicate that the value is unknown.
+ * Variable-length integer can hold a 63-bit unsigned integer or a special
+ * value indicating that the value is unknown.
+ *
+ * Experimental: vli_type can be defined to uint32_t to save a few bytes
+ * in code size (no effect on speed). Doing so limits the uncompressed and
+ * compressed size of the file to less than 256 MiB and may also weaken
+ * error detection slightly.
  */
 typedef uint64_t vli_type;