Merge branch 'busybox' into merge

1 files changed, 15 insertions, 10 deletions

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 */