Merge branch 'busybox' into merge

8 files changed, 140 insertions, 69 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 311c7333e..1e3d6e586 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -7,24 +7,30 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
+//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
+//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o
+
 /* lzop_main() uses bbunpack(), need this: */
 //kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
 //kbuild:lib-$(CONFIG_LZOPCAT) += bbunzip.o
 //kbuild:lib-$(CONFIG_UNLZOP) += bbunzip.o
 /* bzip2_main() too: */
-//kbuild:lib-$(CONFIG_FEATURE_BZIP2_DECOMPRESS) += bbunzip.o
+//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
 /* gzip_main() too: */
-//kbuild:lib-$(CONFIG_FEATURE_GZIP_DECOMPRESS) += bbunzip.o
+//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
 
 /* 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_QUIET      = 1 << 3,
-        OPT_DECOMPRESS = 1 << 4,
-        OPT_TEST       = 1 << 5,
+        OPT_KEEP       = 1 << 2,
+        OPT_VERBOSE    = 1 << 3,
+        OPT_QUIET      = 1 << 4,
+        OPT_DECOMPRESS = 1 << 5,
+        OPT_TEST       = 1 << 6,
         SEAMLESS_MAGIC = (1 << 31) * ENABLE_ZCAT * SEAMLESS_COMPRESSION,
 };
 
@@ -182,10 +188,13 @@ int FAST_FUNC bbunpack(char **argv,
                                 }
                                 /* Delete _source_ file */
                                 del = filename;
+                                if (option_mask32 & OPT_KEEP) /* ... unless -k */
+                                        del = NULL;
                         }
                         if (ENABLE_PLATFORM_MINGW32)
                                 xclose(STDIN_FILENO);
-                        xunlink(del);
+                        if (del)
+                                xunlink(del);
  free_name:
                         if (new_name != filename)
                                 free(new_name);
@@ -242,7 +251,16 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uncompress_main(int argc UNUSED_PARAM, char **argv)
 {
+// (N)compress 4.2.4.4:
+// -d If given, decompression is done instead
+// -c Write output on stdout, don't remove original
+// -b Parameter limits the max number of bits/code
+// -f Forces output file to be generated
+// -v Write compression statistics
+// -V Output vesion and compile options
+// -r Recursive. If a filename is a directory, descend into it and compress everything
         getopt32(argv, "cf");
+
         argv += optind;
 
         return bbunpack(argv, unpack_Z_stream, make_new_name_generic, "Z");
@@ -275,11 +293,12 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
  * Ken Turkowski, Dave Mack and Peter Jannesen.
  */
 //usage:#define gunzip_trivial_usage
-//usage:       "[-cft] [FILE]..."
+//usage:       "[-cfkt] [FILE]..."
 //usage:#define gunzip_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:     "\n        -t      Test file integrity"
 //usage:
 //usage:#define gunzip_example_usage
@@ -374,7 +393,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
         applet_long_options = gunzip_longopts;
 #endif
-        getopt32(argv, "cfvqdtn");
+        getopt32(argv, "cfkvqdtn");
         argv += optind;
 
         /* If called as zcat...
@@ -396,11 +415,12 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //usage:#define bunzip2_trivial_usage
-//usage:       "[-cf] [FILE]..."
+//usage:       "[-cfk] [FILE]..."
 //usage:#define bunzip2_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:#define bzcat_trivial_usage
 //usage:       "[FILE]..."
 //usage:#define bzcat_full_usage "\n\n"
@@ -430,11 +450,11 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main     location        suid_type     help
 //applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
-#if ENABLE_FEATURE_BZIP2_DECOMPRESS
+#if ENABLE_FEATURE_BZIP2_DECOMPRESS || ENABLE_BUNZIP2 || ENABLE_BZCAT
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
-        getopt32(argv, "cfvqdt");
+        getopt32(argv, "cfkvqdt");
         argv += optind;
         if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
                 option_mask32 |= OPT_STDOUT;
@@ -453,19 +473,21 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //usage:#define unlzma_trivial_usage
-//usage:       "[-cf] [FILE]..."
+//usage:       "[-cfk] [FILE]..."
 //usage:#define unlzma_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:
 //usage:#define lzma_trivial_usage
-//usage:       "-d [-cf] [FILE]..."
+//usage:       "-d [-cfk] [FILE]..."
 //usage:#define lzma_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:
 //usage:#define lzcat_trivial_usage
 //usage:       "[FILE]..."
@@ -522,7 +544,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 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, "cfvqdt");
+        IF_LZMA(int opts =) getopt32(argv, "cfkvqdt");
 # if ENABLE_LZMA
         /* lzma without -d or -t? */
         if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -539,19 +561,21 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 
 
 //usage:#define unxz_trivial_usage
-//usage:       "[-cf] [FILE]..."
+//usage:       "[-cfk] [FILE]..."
 //usage:#define unxz_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:
 //usage:#define xz_trivial_usage
-//usage:       "-d [-cf] [FILE]..."
+//usage:       "-d [-cfk] [FILE]..."
 //usage:#define xz_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:
 //usage:#define xzcat_trivial_usage
 //usage:       "[FILE]..."
@@ -588,7 +612,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 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, "cfvqdt");
+        IF_XZ(int opts =) getopt32(argv, "cfkvqdt");
 # if ENABLE_XZ
         /* xz without -d or -t? */
         if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 7e38e78b3..8afa43802 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -43,6 +43,7 @@
 //usage:        )
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 
 #include "libbb.h"
 #include "bb_archive.h"
@@ -196,13 +197,13 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
 
         opt_complementary = "s2"; /* -s means -2 (compatibility) */
         /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-        opt = getopt32(argv, "cfv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs");
+        opt = getopt32(argv, "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs");
 #if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
-        if (opt & 0x18) // -d and/or -t
+        if (opt & 0x30) // -d and/or -t
                 return bunzip2_main(argc, argv);
-        opt >>= 5;
+        opt >>= 6;
 #else
-        opt >>= 3;
+        opt >>= 4;
 #endif
         opt = (uint8_t)opt; /* isolate bits for -1..-8 */
         opt |= 0x100; /* if nothing else, assume -9 */
@@ -213,6 +214,6 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
         }
 
         argv += optind;
-        option_mask32 &= 0x7; /* ignore all except -cfv */
+        option_mask32 &= 0xf; /* ignore all except -cfkv */
         return bbunpack(argv, compressStream, append_ext, "bz2");
 }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 1cd45eda4..da3b0864e 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1938,10 +1938,6 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
                 for (i = 0; i < STATUS_HASH_PRIME; i++) {
                         free(status_hashtable[i]);
                 }
-
-                free(status_hashtable);
-                free(package_hashtable);
-                free(name_hashtable);
         }
 
         return EXIT_SUCCESS;
diff --git a/archival/gzip.c b/archival/gzip.c
index e698c26cd..c895de426 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -84,7 +84,7 @@ aa:      85.1% -- replaced with aa.gz
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
 
 //usage:#define gzip_trivial_usage
-//usage:       "[-cf" IF_FEATURE_GZIP_DECOMPRESS("dt") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
+//usage:       "[-cfk" IF_FEATURE_GZIP_DECOMPRESS("dt") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
 //usage:        IF_FEATURE_GZIP_LEVELS(
@@ -96,6 +96,7 @@ aa:      85.1% -- replaced with aa.gz
 //usage:        )
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -k      Keep input files"
 //usage:
 //usage:#define gzip_example_usage
 //usage:       "$ ls -la /tmp/busybox*\n"
@@ -275,7 +276,7 @@ enum {
  * input file length plus MIN_LOOKAHEAD.
  */
 
-#ifndef ENABLE_FEATURE_GZIP_LEVELS
+#if !ENABLE_FEATURE_GZIP_LEVELS
 
         max_chain_length = 4096,
 /* To speed up deflation, hash chains are never searched beyond this length.
@@ -314,7 +315,7 @@ enum {
 
 struct globals {
 
-#ifdef ENABLE_FEATURE_GZIP_LEVELS
+#if ENABLE_FEATURE_GZIP_LEVELS
         unsigned max_chain_length;
         unsigned max_lazy_match;
         unsigned good_match;
@@ -2196,7 +2197,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
         unsigned opt;
-#ifdef ENABLE_FEATURE_GZIP_LEVELS
+#if ENABLE_FEATURE_GZIP_LEVELS
         static const struct {
                 uint8_t good;
                 uint8_t chain_shift;
@@ -2219,13 +2220,13 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         applet_long_options = gzip_longopts;
 #endif
         /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-        opt = getopt32(argv, "cfv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789");
+        opt = getopt32(argv, "cfkv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789");
 #if ENABLE_FEATURE_GZIP_DECOMPRESS /* gunzip_main may not be visible... */
-        if (opt & 0x18) // -d and/or -t
+        if (opt & 0x30) // -d and/or -t
                 return gunzip_main(argc, argv);
 #endif
-#ifdef ENABLE_FEATURE_GZIP_LEVELS
-        opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 7 : 5; /* drop cfv[dt]qn bits */
+#if ENABLE_FEATURE_GZIP_LEVELS
+        opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 8 : 6; /* drop cfkv[dt]qn bits */
         if (opt == 0)
                 opt = 1 << 6; /* default: 6 */
         opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
@@ -2234,7 +2235,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         max_lazy_match   = gzip_level_config[opt].lazy2 * 2;
         nice_match       = gzip_level_config[opt].nice2 * 2;
 #endif
-        option_mask32 &= 0x7; /* retain only -cfv */
+        option_mask32 &= 0xf; /* retain only -cfkv */
 
         /* Allocate all global buffers (for DYN_ALLOC option) */
         ALLOC(uch, G1.l_buf, INBUFSIZ);
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index cd32cc745..350e5358a 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -27,11 +27,17 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
         return ~crc32_block_endian0(~crc, buf, size, global_crc32_table);
 }
 
-/* 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_unaligned32(buf, SWAP_LE32(val))
-#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
+/* We use arch-optimized unaligned fixed-endian accessors.
+ * They have been moved to libbb (proved to be useful elsewhere as well),
+ * just check that we have them defined:
+ */
+#if !defined(get_unaligned_le32) \
+ || !defined(get_unaligned_be32) \
+ || !defined(put_unaligned_le32) \
+ || !defined(put_unaligned_be32)
+# error get_unaligned_le32 accessors are not defined
+#endif
+#define get_le32(p) (*(uint32_t*)(p))
 
 #include "unxz/xz_dec_bcj.c"
 #include "unxz/xz_dec_lzma2.c"
diff --git a/archival/lzop.c b/archival/lzop.c
index ca61add3c..6ef82b749 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -33,13 +33,13 @@
 //config:
 //config:config UNLZOP
 //config:       bool "unlzop"
-//config:       default y
+//config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
 //config:         Lzop decompresion.
 //config:
 //config:config LZOPCAT
 //config:       bool "lzopcat"
-//config:       default y
+//config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
 //config:         Alias to "unlzop -c".
 //config:
@@ -61,12 +61,14 @@
 //kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
 
 //usage:#define lzop_trivial_usage
-//usage:       "[-cfvd123456789CF] [FILE]..."
+//usage:       "[-cfUvd123456789CF] [FILE]..."
 //usage:#define lzop_full_usage "\n\n"
 //usage:       "        -1..9   Compression level"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -U      Delete input files"
+///////:     "\n        -k      Keep input files" (default, so why bother documenting?)
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -F      Don't store or verify checksum"
 //usage:     "\n        -C      Also write checksum of compressed block"
@@ -78,10 +80,12 @@
 //usage:     "\n        -F      Don't verify checksum"
 //usage:
 //usage:#define unlzop_trivial_usage
-//usage:       "[-cfvF] [FILE]..."
+//usage:       "[-cfkvF] [FILE]..."
 //usage:#define unlzop_full_usage "\n\n"
 //usage:       "        -c      Write to stdout"
 //usage:     "\n        -f      Force"
+//usage:     "\n        -U      Delete input files"
+///////:     "\n        -k      Keep input files" (default, so why bother documenting?)
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -F      Don't verify checksum"
 
@@ -472,27 +476,33 @@ struct globals {
 //#define LZOP_VERSION_STRING     "1.01"
 //#define LZOP_VERSION_DATE       "Apr 27th 2003"
 
-#define OPTION_STRING "cfvqdt123456789CF"
+// lzop wants to be weird:
+// unlike all other compressosrs, its -k "keep" option is the default,
+// and -U is used to delete the source. We will invert the bit after getopt().
+#define OPTION_STRING "cfUvqdt123456789CFk"
 
 /* Note: must be kept in sync with archival/bbunzip.c */
 enum {
         OPT_STDOUT      = (1 << 0),
         OPT_FORCE       = (1 << 1),
-        OPT_VERBOSE     = (1 << 2),
-        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_KEEP        = (1 << 2),
+        OPT_VERBOSE     = (1 << 3),
+        OPT_QUIET       = (1 << 4),
+        OPT_DECOMPRESS  = (1 << 5),
+        OPT_TEST        = (1 << 6),
+        OPT_1           = (1 << 7),
+        OPT_2           = (1 << 8),
+        OPT_3           = (1 << 9),
+        OPT_4           = (1 << 10),
+        OPT_5           = (1 << 11),
+        OPT_6           = (1 << 12),
         OPT_7           = (1 << 13),
         OPT_8           = (1 << 14),
-        OPT_C           = (1 << 15),
-        OPT_F           = (1 << 16),
+        OPT_9           = (1 << 15),
+        OPT_C           = (1 << 16),
+        OPT_F           = (1 << 17),
+        OPT_k           = (1 << 18),
+        OPT_789         = OPT_7 | OPT_8 | OPT_9
 };
 
 /**********************************************************************/
@@ -1125,6 +1135,13 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
 {
         getopt32(argv, OPTION_STRING);
         argv += optind;
+        /* -U is "anti -k", invert bit for bbunpack(): */
+        option_mask32 ^= OPT_KEEP;
+        /* -k disables -U (if any): */
+        /* opt_complementary = "k-U"; - nope, only handles -Uk, not -kU */
+        if (option_mask32 & OPT_k)
+                option_mask32 |= OPT_KEEP;
+
         /* lzopcat? */
         if (ENABLE_LZOPCAT && applet_name[4] == 'c')
                 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
diff --git a/archival/tar.c b/archival/tar.c
index be5838d0d..c11b735d5 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1245,21 +1245,26 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)
                 USE_FOR_NOMMU(const char *xformer_prog;)
 
-                if (opt & OPT_COMPRESS)
-                        USE_FOR_MMU(xformer = unpack_Z_stream;)
+                if (opt & OPT_COMPRESS) {
+                        USE_FOR_MMU(IF_FEATURE_SEAMLESS_Z(xformer = unpack_Z_stream;))
                         USE_FOR_NOMMU(xformer_prog = "uncompress";)
-                if (opt & OPT_GZIP)
-                        USE_FOR_MMU(xformer = unpack_gz_stream;)
+                }
+                if (opt & OPT_GZIP) {
+                        USE_FOR_MMU(IF_FEATURE_SEAMLESS_GZ(xformer = unpack_gz_stream;))
                         USE_FOR_NOMMU(xformer_prog = "gunzip";)
-                if (opt & OPT_BZIP2)
-                        USE_FOR_MMU(xformer = unpack_bz2_stream;)
+                }
+                if (opt & OPT_BZIP2) {
+                        USE_FOR_MMU(IF_FEATURE_SEAMLESS_BZ2(xformer = unpack_bz2_stream;))
                         USE_FOR_NOMMU(xformer_prog = "bunzip2";)
-                if (opt & OPT_LZMA)
-                        USE_FOR_MMU(xformer = unpack_lzma_stream;)
+                }
+                if (opt & OPT_LZMA) {
+                        USE_FOR_MMU(IF_FEATURE_SEAMLESS_LZMA(xformer = unpack_lzma_stream;))
                         USE_FOR_NOMMU(xformer_prog = "unlzma";)
-                if (opt & OPT_XZ)
-                        USE_FOR_MMU(xformer = unpack_xz_stream;)
+                }
+                if (opt & OPT_XZ) {
+                        USE_FOR_MMU(IF_FEATURE_SEAMLESS_XZ(xformer = unpack_xz_stream;))
                         USE_FOR_NOMMU(xformer_prog = "unxz";)
+                }
 
                 fork_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
                 /* Can't lseek over pipes */
diff --git a/archival/unzip.c b/archival/unzip.c
index 986145d0f..8dfc4e678 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -349,6 +349,12 @@ static void unzip_extract(zip_header_t *zip, int dst_fd)
                 return;
         }
 
+// NB: to support symlinks, need to extract symlink target. A-la:
+// xstate.mem_output_size_max = zip->fmt.ucmpsize;
+// ...unpack...
+// if (xstate.mem_output_buf) { success, xstate.mem_output_size is the size }
+// Although archives I've seen have fmt.method == 0 for symlinks.
+
         init_transformer_state(&xstate);
         xstate.bytes_in = zip->fmt.cmpsize;
         xstate.src_fd = zip_fd;
@@ -688,6 +694,20 @@ int unzip_main(int argc, char **argv)
                                 zip.fmt.cmpsize  = cdf.fmt.cmpsize;
                                 zip.fmt.ucmpsize = cdf.fmt.ucmpsize;
                         }
+// Seen in some zipfiles: central directory 9 byte extra field contains
+// a subfield with ID 0x5455 and 5 data bytes, which is a Unix-style UTC mtime.
+// Local header version:
+//  u16 0x5455 ("UT")
+//  u16 size (1 + 4 * n)
+//  u8  flags: bit 0:mtime is present, bit 1:atime is present, bit 2:ctime is present
+//  u32 mtime
+//  u32 atime
+//  u32 ctime
+// Central header version:
+//  u16 0x5455 ("UT")
+//  u16 size (5 (or 1?))
+//  u8  flags: bit 0:mtime is present, bit 1:atime is present, bit 2:ctime is present
+//  u32 mtime (CDF does not store atime/ctime)
 # else
                         /* CDF has the same data as local header, no need to read the latter...
                          * ...not really. An archive was seen with cdf.extra_len == 6 but
@@ -702,6 +722,7 @@ int unzip_main(int argc, char **argv)
                         if ((cdf.fmt.version_made_by >> 8) == 3) {
                                 /* This archive is created on Unix */
                                 dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
+//TODO: if (S_ISLNK(file_mode)) this is a symlink
                         }
                 }
 #endif