Merge branch 'busybox' into merge

12 files changed, 345 insertions, 246 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 66a046052..f77ac8383 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -7,13 +7,16 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
+/* Note: must be kept in sync with archival/lzop.c */
 enum {
         OPT_STDOUT     = 1 << 0,
         OPT_FORCE      = 1 << 1,
         /* only some decompressors: */
         OPT_VERBOSE    = 1 << 2,
-        OPT_DECOMPRESS = 1 << 3,
-        OPT_TEST       = 1 << 4,
+        OPT_QUIET      = 1 << 3,
+        OPT_DECOMPRESS = 1 << 4,
+        OPT_TEST       = 1 << 5,
+        SEAMLESS_MAGIC = (1 << 31) * SEAMLESS_COMPRESSION,
 };
 
 static
@@ -39,7 +42,7 @@ int FAST_FUNC bbunpack(char **argv,
 )
 {
         struct stat stat_buf;
-        IF_DESKTOP(long long) int status;
+        IF_DESKTOP(long long) int status = 0;
         char *filename, *new_name;
         smallint exitcode = 0;
         transformer_aux_data_t aux;
@@ -54,13 +57,27 @@ int FAST_FUNC bbunpack(char **argv,
 
                 /* Open src */
                 if (filename) {
-                        if (stat(filename, &stat_buf) != 0) {
-                                bb_simple_perror_msg(filename);
+                        if (!(option_mask32 & SEAMLESS_MAGIC)) {
+                                if (stat(filename, &stat_buf) != 0) {
+ err_name:
+                                        bb_simple_perror_msg(filename);
  err:
-                                exitcode = 1;
-                                goto free_name;
+                                        exitcode = 1;
+                                        goto free_name;
+                                }
+                                if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0))
+                                        goto err;
+                        } else {
+                                /* "clever zcat" with FILE */
+                                int fd = open_zipped(filename);
+                                if (fd < 0)
+                                        goto err_name;
+                                xmove_fd(fd, STDIN_FILENO);
                         }
-                        if (open_to_or_warn(STDIN_FILENO, filename, O_RDONLY, 0))
+                } else
+                if (option_mask32 & SEAMLESS_MAGIC) {
+                        /* "clever zcat" on stdin */
+                        if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_detected*/ 0))
                                 goto err;
                 }
 
@@ -68,7 +85,7 @@ int FAST_FUNC bbunpack(char **argv,
                 if (option_mask32 & (OPT_STDOUT|OPT_TEST)) {
                         if (option_mask32 & OPT_TEST)
                                 if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0))
-                                        goto err;
+                                        xfunc_die();
                         filename = NULL;
                 }
 
@@ -93,16 +110,22 @@ int FAST_FUNC bbunpack(char **argv,
                 }
 
                 /* Check that the input is sane */
-                if (isatty(STDIN_FILENO) && (option_mask32 & OPT_FORCE) == 0) {
+                if (!(option_mask32 & OPT_FORCE) && isatty(STDIN_FILENO)) {
                         bb_error_msg_and_die("compressed data not read from terminal, "
                                         "use -f to force it");
                 }
 
-                init_transformer_aux_data(&aux);
-                aux.check_signature = 1;
-                status = unpacker(&aux);
-                if (status < 0)
-                        exitcode = 1;
+                if (!(option_mask32 & SEAMLESS_MAGIC)) {
+                        init_transformer_aux_data(&aux);
+                        aux.check_signature = 1;
+                        status = unpacker(&aux);
+                        if (status < 0)
+                                exitcode = 1;
+                } else {
+                        if (bb_copyfd_eof(STDIN_FILENO, STDOUT_FILENO) < 0)
+                                /* Disk full, tty closed, etc. No point in continuing */
+                                xfunc_die();
+                }
 
                 if (!(option_mask32 & OPT_STDOUT))
                         xclose(STDOUT_FILENO); /* with error check! */
@@ -243,7 +266,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
 //usage:
 //usage:#define zcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define zcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 
@@ -294,11 +317,15 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_aux_data_t *aux)
 int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "cfvdtn");
+        getopt32(argv, "cfvqdtn");
         argv += optind;
-        /* if called as zcat */
+
+        /* If called as zcat...
+         * Normally, "zcat" is just "gunzip -c".
+         * But if seamless magic is enabled, then we are much more clever.
+         */
         if (applet_name[1] == 'c')
-                option_mask32 |= OPT_STDOUT;
+                option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL);
 }
@@ -318,7 +345,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:#define bzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define bzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -332,7 +359,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "cfvdt");
+        getopt32(argv, "cfvqdt");
         argv += optind;
         if (applet_name[2] == 'c') /* bzcat */
                 option_mask32 |= OPT_STDOUT;
@@ -367,7 +394,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -f      Force"
 //usage:
 //usage:#define lzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define lzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 //usage:
@@ -387,7 +414,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:     "\n        -f      Force"
 //usage:
 //usage:#define xzcat_trivial_usage
-//usage:       "FILE"
+//usage:       "[FILE]..."
 //usage:#define xzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
 
@@ -400,7 +427,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
 int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unlzma_main(int argc UNUSED_PARAM, char **argv)
 {
-        IF_LZMA(int opts =) getopt32(argv, "cfvdt");
+        IF_LZMA(int opts =) getopt32(argv, "cfvqdt");
 # if ENABLE_LZMA
         /* lzma without -d or -t? */
         if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -425,7 +452,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux)
 int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unxz_main(int argc UNUSED_PARAM, char **argv)
 {
-        IF_XZ(int opts =) getopt32(argv, "cfvdt");
+        IF_XZ(int opts =) getopt32(argv, "cfvqdt");
 # if ENABLE_XZ
         /* xz without -d or -t? */
         if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 3f67b835f..45776dcbe 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -106,15 +106,28 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         switch (file_header->mode & S_IFMT) {
         case S_IFREG: {
                 /* Regular file */
+                char *dst_name;
                 int flags = O_WRONLY | O_CREAT | O_EXCL;
                 if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
                         flags = O_WRONLY | O_CREAT | O_TRUNC;
-                dst_fd = xopen3(file_header->name,
+                dst_name = file_header->name;
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
+                        /* rpm-style temp file name */
+                        dst_name = xasprintf("%s;%x", dst_name, (int)getpid());
+#endif
+                dst_fd = xopen3(dst_name,
                         flags,
                         file_header->mode
                         );
                 bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
                 close(dst_fd);
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
+                        xrename(dst_name, file_header->name);
+                        free(dst_name);
+                }
+#endif
                 break;
         }
         case S_IFDIR:
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index cfde8ea56..ca32bd82c 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -45,16 +45,16 @@ typedef struct {
 #define RC_MODEL_TOTAL_BITS 11
 
 
-/* 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);
 //TODO: return -1 instead
 //This will make unlzma delete broken unpacked file on unpack errors
         if (buffer_size <= 0)
                 bb_error_msg_and_die("unexpected EOF");
-        rc->ptr = RC_BUFFER;
         rc->buffer_end = RC_BUFFER + buffer_size;
+        rc->ptr = RC_BUFFER;
 }
 
 /* Called twice, but one callsite is in speed_inline'd rc_is_bit_1() */
@@ -65,6 +65,12 @@ static void rc_do_normalize(rc_t *rc)
         rc->range <<= 8;
         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 */
 static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
@@ -78,15 +84,9 @@ static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
         /* rc->ptr = rc->buffer_end; */
 
         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;
 }
 
@@ -96,13 +96,6 @@ static ALWAYS_INLINE void rc_free(rc_t *rc)
         free(rc);
 }
 
-static ALWAYS_INLINE void rc_normalize(rc_t *rc)
-{
-        if (rc->range < (1 << RC_TOP_BITS)) {
-                rc_do_normalize(rc);
-        }
-}
-
 /* rc_is_bit_1 is called 9 times */
 static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
 {
@@ -120,7 +113,7 @@ static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
 }
 
 /* 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);
         *symbol = *symbol * 2 + ret;
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 79b48a152..986b7b191 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
 /* We use arch-optimized unaligned accessors */
 #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
 #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
 
 #include "unxz/xz_dec_bcj.c"
 #include "unxz/xz_dec_lzma2.c"
@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
 IF_DESKTOP(long long) int FAST_FUNC
 unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
+        enum xz_ret xz_result;
         struct xz_buf iobuf;
         struct xz_dec *state;
         unsigned char *membuf;
@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
         /* Limit memory usage to about 64 MiB. */
         state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
 
+        xz_result = X_OK;
         while (1) {
-                enum xz_ret r;
-
                 if (iobuf.in_pos == iobuf.in_size) {
                         int rd = safe_read(src_fd, membuf, BUFSIZ);
                         if (rd < 0) {
@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
                                 total = -1;
                                 break;
                         }
+                        if (rd == 0 && xz_result == XZ_STREAM_END)
+                                break;
                         iobuf.in_size = rd;
                         iobuf.in_pos = 0;
                 }
+                if (xz_result == XZ_STREAM_END) {
+                        /*
+                         * Try to start decoding next concatenated stream.
+                         * Stream padding must always be a multiple of four
+                         * bytes to preserve four-byte alignment. To keep the
+                         * code slightly smaller, we aren't as strict here as
+                         * the .xz spec requires. We just skip all zero-bytes
+                         * without checking the alignment and thus can accept
+                         * files that aren't valid, e.g. the XZ utils test
+                         * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
+                         */
+                        do {
+                                if (membuf[iobuf.in_pos] != 0) {
+                                        xz_dec_reset(state);
+                                        goto do_run;
+                                }
+                                iobuf.in_pos++;
+                        } while (iobuf.in_pos < iobuf.in_size);
+                }
+ do_run:
 //              bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
 //                              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
-                r = xz_dec_run(state, &iobuf);
+                xz_result = xz_dec_run(state, &iobuf);
 //              bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
-//                              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
+//                              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);
                         IF_DESKTOP(total += iobuf.out_pos;)
                         iobuf.out_pos = 0;
                 }
-                if (r == XZ_STREAM_END) {
-                        break;
+                if (xz_result == XZ_STREAM_END) {
+                        /*
+                         * Can just "break;" here, if not for concatenated
+                         * .xz streams.
+                         * Checking for padding may require buffer
+                         * replenishment. Can't do it here.
+                         */
+                        continue;
                 }
-                if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
+                if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
                         bb_error_msg("corrupted data");
                         total = -1;
                         break;
                 }
         }
+
         xz_dec_end(state);
         free(membuf);
 
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index f2edc2a2b..841e9dce9 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -35,6 +35,7 @@ void check_errors_in_children(int signo)
         if (!signo) {
                 /* block waiting for any child */
                 if (wait(&status) < 0)
+//FIXME: check EINTR?
                         return; /* probably there are no children */
                 goto check_status;
         }
@@ -42,14 +43,18 @@ void check_errors_in_children(int signo)
         /* Wait for any child without blocking */
         for (;;) {
                 if (wait_any_nohang(&status) < 0)
+//FIXME: check EINTR?
                         /* wait failed?! I'm confused... */
                         return;
  check_status:
-                if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+                /*if (WIFEXITED(status) && WEXITSTATUS(status) == 0)*/
+                /* On Linux, the above can be checked simply as: */
+                if (status == 0)
                         /* this child exited with 0 */
                         continue;
-                /* Cannot happen?
-                if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
+                /* Cannot happen:
+                if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???;
+                 */
                 bb_got_signal = 1;
         }
 }
diff --git a/archival/libarchive/unxz/README b/archival/libarchive/unxz/README
index c5972f6b8..a84912035 100644
--- a/archival/libarchive/unxz/README
+++ b/archival/libarchive/unxz/README
@@ -7,7 +7,7 @@ XZ Embedded
 
     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
     of XZ Embedded isn't part of the Linux kernel tree. You should also
@@ -55,7 +55,7 @@ Compiler requirements
     code is modified not to support large files, which needs some more
     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.
 
@@ -93,7 +93,7 @@ BCJ filter support
     them always #defined doesn't hurt either.
 
         #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
         XZ_DEC_ARM          ARM                 Little endian only
diff --git a/archival/libarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h
index c6c071c4a..e0b22db56 100644
--- a/archival/libarchive/unxz/xz.h
+++ b/archival/libarchive/unxz/xz.h
@@ -19,6 +19,10 @@
 #       include <stdint.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* In Linux, this is used to make extern functions static when needed. */
 #ifndef XZ_EXTERN
 #       define XZ_EXTERN extern
@@ -70,7 +74,7 @@ enum xz_mode {
  * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
  *                          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
  *                          check types return XZ_OPTIONS_ERROR if
@@ -105,7 +109,7 @@ enum xz_mode {
  * stream that is truncated or otherwise corrupt.
  *
  * 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
  * is used instead of XZ_BUF_ERROR.
@@ -207,8 +211,8 @@ XZ_EXTERN struct xz_dec * XZ_FUNC xz_dec_init(
  * The possible return values depend on build options and operation mode.
  * 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
  * chains, there may be a second pass over the output buffer, and this pass
@@ -268,4 +272,9 @@ XZ_EXTERN void XZ_FUNC xz_crc32_init(void);
 XZ_EXTERN uint32_t XZ_FUNC xz_crc32(
                 const uint8_t *buf, size_t size, uint32_t crc);
 #endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/archival/libarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c
index 09162b51f..e0f913a94 100644
--- a/archival/libarchive/unxz/xz_dec_bcj.c
+++ b/archival/libarchive/unxz/xz_dec_bcj.c
@@ -77,10 +77,13 @@ struct xz_dec_bcj {
 
 #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(
                 struct xz_dec_bcj *s, uint8_t *buf, size_t size)
@@ -443,8 +446,12 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s,
          * next filter in the chain. Apply the BCJ filter on the new data
          * 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);
                 b->out_pos += s->temp.size;
@@ -467,16 +474,25 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_bcj_run(struct xz_dec_bcj *s,
                 s->temp.size = b->out_pos - out_start;
                 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;
                 s->out_pos = b->out_pos;
diff --git a/archival/libarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index da71cb4d4..3c2dc88b7 100644
--- a/archival/libarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
@@ -407,7 +407,6 @@ static void XZ_FUNC dict_uncompressed(
 
                 b->out_pos += copy_size;
                 b->in_pos += copy_size;
-
         }
 }
 
@@ -972,6 +971,9 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
                          */
                         tmp = b->in[b->in_pos++];
 
+                        if (tmp == 0x00)
+                                return XZ_STREAM_END;
+
                         if (tmp >= 0xE0 || tmp == 0x01) {
                                 s->lzma2.need_props = true;
                                 s->lzma2.need_dict_reset = false;
@@ -1004,9 +1006,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
                                                 lzma_reset(s);
                                 }
                         } else {
-                                if (tmp == 0x00)
-                                        return XZ_STREAM_END;
-
                                 if (tmp > 0x02)
                                         return XZ_DATA_ERROR;
 
diff --git a/archival/libarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 36f2a7cbf..66cb5a705 100644
--- a/archival/libarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
@@ -25,15 +25,20 @@
 
 #define STREAM_HEADER_SIZE 12
 
-#define HEADER_MAGIC "\3757zXZ\0"
+#define HEADER_MAGIC "\3757zXZ"
 #define HEADER_MAGIC_SIZE 6
 
 #define FOOTER_MAGIC "YZ"
 #define FOOTER_MAGIC_SIZE 2
 
 /*
- * 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;
 
diff --git a/archival/lzop.c b/archival/lzop.c
index 56003d421..9b42e5fd3 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -436,25 +436,27 @@ struct globals {
 //#define LZOP_VERSION_STRING     "1.01"
 //#define LZOP_VERSION_DATE       "Apr 27th 2003"
 
-#define OPTION_STRING "cfvdt123456789CF"
+#define OPTION_STRING "cfvqdt123456789CF"
 
+/* Note: must be kept in sync with archival/bbunzip.c */
 enum {
         OPT_STDOUT      = (1 << 0),
         OPT_FORCE       = (1 << 1),
         OPT_VERBOSE     = (1 << 2),
-        OPT_DECOMPRESS  = (1 << 3),
-        OPT_TEST        = (1 << 4),
-        OPT_1           = (1 << 5),
-        OPT_2           = (1 << 6),
-        OPT_3           = (1 << 7),
-        OPT_4           = (1 << 8),
-        OPT_5           = (1 << 9),
-        OPT_6           = (1 << 10),
-        OPT_789         = (7 << 11),
-        OPT_7           = (1 << 11),
-        OPT_8           = (1 << 12),
-        OPT_C           = (1 << 14),
-        OPT_F           = (1 << 15),
+        OPT_QUIET       = (1 << 3),
+        OPT_DECOMPRESS  = (1 << 4),
+        OPT_TEST        = (1 << 5),
+        OPT_1           = (1 << 6),
+        OPT_2           = (1 << 7),
+        OPT_3           = (1 << 8),
+        OPT_4           = (1 << 9),
+        OPT_5           = (1 << 10),
+        OPT_6           = (1 << 11),
+        OPT_789         = (7 << 12),
+        OPT_7           = (1 << 13),
+        OPT_8           = (1 << 14),
+        OPT_C           = (1 << 15),
+        OPT_F           = (1 << 16),
 };
 
 /**********************************************************************/
@@ -1093,7 +1095,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
         if (applet_name[4] == 'c')
                 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
         /* unlzop? */
-        if (applet_name[0] == 'u')
+        if (applet_name[4] == 'o')
                 option_mask32 |= OPT_DECOMPRESS;
 
         global_crc32_table = crc32_filltable(NULL, 0);
diff --git a/archival/rpm.c b/archival/rpm.c
index 6757a6ceb..86ba4dca4 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -14,10 +14,10 @@
 //usage:     "\nCommands:"
 //usage:     "\n        -i      Install package"
 //usage:     "\n        -qp     Query package"
-//usage:     "\n        -i      Show information"
-//usage:     "\n        -l      List contents"
-//usage:     "\n        -d      List documents"
-//usage:     "\n        -c      List config files"
+//usage:     "\n        -qpi    Show information"
+//usage:     "\n        -qpl    List contents"
+//usage:     "\n        -qpd    List documents"
+//usage:     "\n        -qpc    List config files"
 
 #include "libbb.h"
 #include "bb_archive.h"
@@ -79,136 +79,13 @@ typedef struct {
         uint32_t count; /* 4 byte count */
 } rpm_index;
 
-static void *map;
-static rpm_index **mytags;
-static int tagcount;
-
-static void extract_cpio(int fd, const char *source_rpm);
-static rpm_index **rpm_gettags(int fd, int *num_tags);
-static int bsearch_rpmtag(const void *key, const void *item);
-static char *rpm_getstr(int tag, int itemindex);
-static int rpm_getint(int tag, int itemindex);
-static int rpm_getcount(int tag);
-static void fileaction_dobackup(char *filename, int fileref);
-static void fileaction_setowngrp(char *filename, int fileref);
-static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref));
-
-int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int rpm_main(int argc, char **argv)
-{
-        int opt = 0, func = 0, rpm_fd, offset;
-        const int pagesize = getpagesize();
-
-        while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
-                switch (opt) {
-                case 'i': /* First arg: Install mode, with q: Information */
-                        if (!func) func = rpm_install;
-                        else func |= rpm_query_info;
-                        break;
-                case 'q': /* First arg: Query mode */
-                        if (func) bb_show_usage();
-                        func = rpm_query;
-                        break;
-                case 'p': /* Query a package */
-                        func |= rpm_query_package;
-                        break;
-                case 'l': /* List files in a package */
-                        func |= rpm_query_list;
-                        break;
-                case 'd': /* List doc files in a package (implies list) */
-                        func |= rpm_query_list;
-                        func |= rpm_query_list_doc;
-                        break;
-                case 'c': /* List config files in a package (implies list) */
-                        func |= rpm_query_list;
-                        func |= rpm_query_list_config;
-                        break;
-                default:
-                        bb_show_usage();
-                }
-        }
-        argv += optind;
-        //argc -= optind;
-        if (!argv[0]) {
-                bb_show_usage();
-        }
-
-        while (*argv) {
-                const char *source_rpm;
-
-                rpm_fd = xopen(*argv++, O_RDONLY);
-                mytags = rpm_gettags(rpm_fd, &tagcount);
-                if (!mytags)
-                        bb_error_msg_and_die("error reading rpm header");
-                offset = xlseek(rpm_fd, 0, SEEK_CUR);
-                /* Mimimum is one page */
-                map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
-
-                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
-
-                if (func & rpm_install) {
-                        /* Backup any config files */
-                        loop_through_files(TAG_BASENAMES, fileaction_dobackup);
-                        /* Extact the archive */
-                        extract_cpio(rpm_fd, source_rpm);
-                        /* Set the correct file uid/gid's */
-                        loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
-                }
-                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
-                        if (!(func & (rpm_query_info|rpm_query_list))) {
-                                /* If just a straight query, just give package name */
-                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
-                        }
-                        if (func & rpm_query_info) {
-                                /* Do the nice printout */
-                                time_t bdate_time;
-                                struct tm *bdate_ptm;
-                                char bdatestring[50];
-                                const char *p;
-
-                                p = rpm_getstr(TAG_PREFIXS, 0);
-                                if (!p) p = "(not relocateable)";
-                                printf("Name        : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), p);
-                                p = rpm_getstr(TAG_VENDOR, 0);
-                                if (!p) p = "(none)";
-                                printf("Version     : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), p);
-                                bdate_time = rpm_getint(TAG_BUILDTIME, 0);
-                                bdate_ptm = localtime(&bdate_time);
-                                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
-                                printf("Release     : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring);
-                                printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0));
-                                printf("Group       : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm);
-                                printf("Size        : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0));
-                                printf("URL         : %s\n", rpm_getstr(TAG_URL, 0));
-                                printf("Summary     : %s\n", rpm_getstr(TAG_SUMMARY, 0));
-                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
-                        }
-                        if (func & rpm_query_list) {
-                                int count, it, flags;
-                                count = rpm_getcount(TAG_BASENAMES);
-                                for (it = 0; it < count; it++) {
-                                        flags = rpm_getint(TAG_FILEFLAGS, it);
-                                        switch (func & (rpm_query_list_doc|rpm_query_list_config)) {
-                                        case rpm_query_list_doc:
-                                                if (!(flags & RPMFILE_DOC)) continue;
-                                                break;
-                                        case rpm_query_list_config:
-                                                if (!(flags & RPMFILE_CONFIG)) continue;
-                                                break;
-                                        case rpm_query_list_doc|rpm_query_list_config:
-                                                if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue;
-                                                break;
-                                        }
-                                        printf("%s%s\n",
-                                                rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)),
-                                                rpm_getstr(TAG_BASENAMES, it));
-                                }
-                        }
-                }
-                free(mytags);
-        }
-        return 0;
-}
+struct globals {
+        void *map;
+        rpm_index **mytags;
+        int tagcount;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
 
 static void extract_cpio(int fd, const char *source_rpm)
 {
@@ -231,8 +108,8 @@ static void extract_cpio(int fd, const char *source_rpm)
                 /* compat: overwrite existing files.
                  * try "rpm -i foo.src.rpm" few times in a row -
                  * standard rpm will not complain.
-                 * (TODO? real rpm creates "file;1234" and then renames it) */
-                | ARCHIVE_UNLINK_OLD;
+                 */
+                | ARCHIVE_REPLACE_VIA_RENAME;
         archive_handle->src_fd = fd;
         /*archive_handle->offset = 0; - init_handle() did it */
 
@@ -294,7 +171,7 @@ static int bsearch_rpmtag(const void *key, const void *item)
 static int rpm_getcount(int tag)
 {
         rpm_index **found;
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found)
                 return 0;
         return found[0]->count;
@@ -303,7 +180,7 @@ static int rpm_getcount(int tag)
 static char *rpm_getstr(int tag, int itemindex)
 {
         rpm_index **found;
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found || itemindex >= found[0]->count)
                 return NULL;
         if (found[0]->type == RPM_STRING_TYPE
@@ -311,7 +188,7 @@ static char *rpm_getstr(int tag, int itemindex)
          || found[0]->type == RPM_STRING_ARRAY_TYPE
         ) {
                 int n;
-                char *tmpstr = (char *) map + found[0]->offset;
+                char *tmpstr = (char *) G.map + found[0]->offset;
                 for (n = 0; n < itemindex; n++)
                         tmpstr = tmpstr + strlen(tmpstr) + 1;
                 return tmpstr;
@@ -322,32 +199,25 @@ static char *rpm_getstr(int tag, int itemindex)
 static int rpm_getint(int tag, int itemindex)
 {
         rpm_index **found;
-        int *tmpint; /* NB: using int8_t* would be easier to code */
+        char *tmpint;
 
         /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
          * it's ok to ignore it because tag won't be used as a pointer */
-        found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
         if (!found || itemindex >= found[0]->count)
                 return -1;
 
-        tmpint = (int *) ((char *) map + found[0]->offset);
-
+        tmpint = (char *) G.map + found[0]->offset;
         if (found[0]->type == RPM_INT32_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex*4);
-                /*return ntohl(*tmpint);*/
-                /* int can be != int32_t */
+                tmpint += itemindex*4;
                 return ntohl(*(int32_t*)tmpint);
         }
         if (found[0]->type == RPM_INT16_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex*2);
-                /* ??? read int, and THEN ntohs() it?? */
-                /*return ntohs(*tmpint);*/
+                tmpint += itemindex*2;
                 return ntohs(*(int16_t*)tmpint);
         }
         if (found[0]->type == RPM_INT8_TYPE) {
-                tmpint = (int *) ((char *) tmpint + itemindex);
-                /* ??? why we don't read byte here??? */
-                /*return ntohs(*tmpint);*/
+                tmpint += itemindex;
                 return *(int8_t*)tmpint;
         }
         return -1;
@@ -392,3 +262,134 @@ static void loop_through_files(int filetag, void (*fileaction)(char *filename, i
                 free(filename);
         }
 }
+
+int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rpm_main(int argc, char **argv)
+{
+        int opt, func = 0;
+        const unsigned pagesize = getpagesize();
+
+        while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
+                switch (opt) {
+                case 'i': /* First arg: Install mode, with q: Information */
+                        if (!func) func = rpm_install;
+                        else func |= rpm_query_info;
+                        break;
+                case 'q': /* First arg: Query mode */
+                        if (func) bb_show_usage();
+                        func = rpm_query;
+                        break;
+                case 'p': /* Query a package */
+                        func |= rpm_query_package;
+                        break;
+                case 'l': /* List files in a package */
+                        func |= rpm_query_list;
+                        break;
+                case 'd': /* List doc files in a package (implies list) */
+                        func |= rpm_query_list;
+                        func |= rpm_query_list_doc;
+                        break;
+                case 'c': /* List config files in a package (implies list) */
+                        func |= rpm_query_list;
+                        func |= rpm_query_list_config;
+                        break;
+                default:
+                        bb_show_usage();
+                }
+        }
+        argv += optind;
+        //argc -= optind;
+        if (!argv[0]) {
+                bb_show_usage();
+        }
+
+        while (*argv) {
+                int rpm_fd;
+                unsigned mapsize;
+                const char *source_rpm;
+
+                rpm_fd = xopen(*argv++, O_RDONLY);
+                G.mytags = rpm_gettags(rpm_fd, &G.tagcount);
+                if (!G.mytags)
+                        bb_error_msg_and_die("error reading rpm header");
+                mapsize = xlseek(rpm_fd, 0, SEEK_CUR);
+                mapsize = (mapsize + pagesize) & -(int)pagesize;
+                /* Some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
+                G.map = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
+//FIXME: error check?
+
+                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
+
+                if (func & rpm_install) {
+                        /* Backup any config files */
+                        loop_through_files(TAG_BASENAMES, fileaction_dobackup);
+                        /* Extact the archive */
+                        extract_cpio(rpm_fd, source_rpm);
+                        /* Set the correct file uid/gid's */
+                        loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
+                }
+                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                        if (!(func & (rpm_query_info|rpm_query_list))) {
+                                /* If just a straight query, just give package name */
+                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
+                        }
+                        if (func & rpm_query_info) {
+                                /* Do the nice printout */
+                                time_t bdate_time;
+                                struct tm *bdate_ptm;
+                                char bdatestring[50];
+                                const char *p;
+
+                                printf("%-12s: %s\n", "Name"        , rpm_getstr(TAG_NAME, 0));
+                                /* TODO compat: add "Epoch" here */
+                                printf("%-12s: %s\n", "Version"     , rpm_getstr(TAG_VERSION, 0));
+                                printf("%-12s: %s\n", "Release"     , rpm_getstr(TAG_RELEASE, 0));
+                                /* add "Architecture" */
+                                printf("%-12s: %s\n", "Install Date", "(not installed)");
+                                printf("%-12s: %s\n", "Group"       , rpm_getstr(TAG_GROUP, 0));
+                                printf("%-12s: %d\n", "Size"        , rpm_getint(TAG_SIZE, 0));
+                                printf("%-12s: %s\n", "License"     , rpm_getstr(TAG_LICENSE, 0));
+                                /* add "Signature" */
+                                printf("%-12s: %s\n", "Source RPM"  , source_rpm ? source_rpm : "(none)");
+                                bdate_time = rpm_getint(TAG_BUILDTIME, 0);
+                                bdate_ptm = localtime(&bdate_time);
+                                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
+                                printf("%-12s: %s\n", "Build Date"  , bdatestring);
+                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr(TAG_BUILDHOST, 0));
+                                p = rpm_getstr(TAG_PREFIXS, 0);
+                                printf("%-12s: %s\n", "Relocations" , p ? p : "(not relocatable)");
+                                /* add "Packager" */
+                                p = rpm_getstr(TAG_VENDOR, 0);
+                                printf("%-12s: %s\n", "Vendor"      , p ? p : "(none)");
+                                printf("%-12s: %s\n", "URL"         , rpm_getstr(TAG_URL, 0));
+                                printf("%-12s: %s\n", "Summary"     , rpm_getstr(TAG_SUMMARY, 0));
+                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
+                        }
+                        if (func & rpm_query_list) {
+                                int count, it, flags;
+                                count = rpm_getcount(TAG_BASENAMES);
+                                for (it = 0; it < count; it++) {
+                                        flags = rpm_getint(TAG_FILEFLAGS, it);
+                                        switch (func & (rpm_query_list_doc|rpm_query_list_config)) {
+                                        case rpm_query_list_doc:
+                                                if (!(flags & RPMFILE_DOC)) continue;
+                                                break;
+                                        case rpm_query_list_config:
+                                                if (!(flags & RPMFILE_CONFIG)) continue;
+                                                break;
+                                        case rpm_query_list_doc|rpm_query_list_config:
+                                                if (!(flags & (RPMFILE_CONFIG|RPMFILE_DOC))) continue;
+                                                break;
+                                        }
+                                        printf("%s%s\n",
+                                                rpm_getstr(TAG_DIRNAMES, rpm_getint(TAG_DIRINDEXES, it)),
+                                                rpm_getstr(TAG_BASENAMES, it));
+                                }
+                        }
+                }
+                munmap(G.map, mapsize);
+                free(G.mytags);
+                close(rpm_fd);
+        }
+        return 0;
+}