Switch an external program for lzma decompression from "unlzma" to

"lzma -d".

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 889847ed73365a62e4cedba210b876f0a55928cf..4b7cfe4e761c059d85caba3a11c1df4c58bcc7f6 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1918,15 +1918,15 @@ canLzip(void)
 }
 
 /*
- * Can this platform run the unlzma program?
+ * Can this platform run the lzma program?
  */
 int
-canUnlzma(void)
+canLzma(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unlzma -V %s", redirectArgs) == 0)
+               if (systemf("lzma -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/cpio/test/test.h b/cpio/test/test.h
index 823d65414b93da06071c61b537e7591eb9844c27..6fc11d8c9daec1dd536b0e96d311a2fd5fed12f3 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -281,8 +281,8 @@ int canLrzip(void);
 /* Return true if this platform can run the "lzip" program. */
 int canLzip(void);
 
-/* Return true if this platform can run the "unlzma" program. */
-int canUnlzma(void);
+/* Return true if this platform can run the "lzma" program. */
+int canLzma(void);
 
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);

diff --git a/cpio/test/test_extract_cpio_lzma.c b/cpio/test/test_extract_cpio_lzma.c
index b90e35b9893d1e39636d1d10e61e9d262f848914..ae630d6119d82bda363d5438eee4f40d4b737f51 100644 (file)
--- a/cpio/test/test_extract_cpio_lzma.c
+++ b/cpio/test/test_extract_cpio_lzma.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_cpio_lzma)
 
        extract_reference_file(reffile);
        f = systemf("%s -it < %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canUnlzma()) {
+       if (f == 0 || canLzma()) {
                assertEqualInt(0, systemf("%s -i < %s >test.out 2>test.err",
                    testprog, reffile));
 

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index fa6ae3fb78185d65d3b320fd382dc8926e8d23ce..2ba2338c6758b37b5d944ce203e56d8f5b3cd63e 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -180,7 +180,7 @@ archive_read_support_filter_lzma(struct archive *_a)
        return (ARCHIVE_OK);
 #else
        archive_set_error(_a, ARCHIVE_ERRNO_MISC,
-           "Using external unlzma program for lzma decompression");
+           "Using external lzma program for lzma decompression");
        return (ARCHIVE_WARN);
 #endif
 }
@@ -941,7 +941,7 @@ lzma_bidder_init(struct archive_read_filter *self)
 {
        int r;
 
-       r = __archive_read_program(self, "unlzma");
+       r = __archive_read_program(self, "lzma -d");
        /* Note: We set the format here even if __archive_read_program()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index de988c0df724fb354cb20a472d9cc11c782c1481..c308f3cd7293ce1ea4e375db8579772169c0a9fb 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1916,15 +1916,15 @@ canLzip(void)
 }
 
 /*
- * Can this platform run the unlzma program?
+ * Can this platform run the lzma program?
  */
 int
-canUnlzma(void)
+canLzma(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unlzma -V %s", redirectArgs) == 0)
+               if (systemf("lzma -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 9c6d7e6c680528c7652e4f8b98568ffd1bfd5002..9a208fd3f7185ae31bc401d7bd92831d580665e3 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -281,8 +281,8 @@ int canLrzip(void);
 /* Return true if this platform can run the "lzip" program. */
 int canLzip(void);
 
-/* Return true if this platform can run the "unlzma" program. */
-int canUnlzma(void);
+/* Return true if this platform can run the "lzma" program. */
+int canLzma(void);
 
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);

diff --git a/tar/test/main.c b/tar/test/main.c
index e0b15dc7300c0c2ffc269bf21283428e345e62fb..7ac577641188f54a2c4a0686c3ebf9fbbeecd607 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1918,15 +1918,15 @@ canLzip(void)
 }
 
 /*
- * Can this platform run the unlzma program?
+ * Can this platform run the lzma program?
  */
 int
-canUnlzma(void)
+canLzma(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unlzma -V %s", redirectArgs) == 0)
+               if (systemf("lzma -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/tar/test/test.h b/tar/test/test.h
index d5a55cfb19714bc23d707b6b920dd260a3450024..1d910c6f2d71d3f5ef1e6d56ec4ea94b94b89470 100644 (file)
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -283,8 +283,8 @@ int canLrzip(void);
 /* Return true if this platform can run the "lzip" program. */
 int canLzip(void);
 
-/* Return true if this platform can run the "unlzma" program. */
-int canUnlzma(void);
+/* Return true if this platform can run the "lzma" program. */
+int canLzma(void);
 
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);

diff --git a/tar/test/test_extract_tar_lzma.c b/tar/test/test_extract_tar_lzma.c
index 977f6d69e59f930db99338123eb1e8703416ce4b..2fa2af049446eaec188a040d5869aaf0665a0843 100644 (file)
--- a/tar/test/test_extract_tar_lzma.c
+++ b/tar/test/test_extract_tar_lzma.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_tar_lzma)
 
        extract_reference_file(reffile);
        f = systemf("%s -tf %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canUnlzma()) {
+       if (f == 0 || canLzma()) {
                assertEqualInt(0, systemf("%s -xf %s >test.out 2>test.err",
                    testprog, reffile));