Switch an external program for xz decompression from "unxz" to

"xz -d".

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 4b7cfe4e761c059d85caba3a11c1df4c58bcc7f6..87e9255344b1f00d12bc5a25d70932784647834d 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1948,15 +1948,15 @@ canLzop(void)
 }
 
 /*
- * Can this platform run the unxz program?
+ * Can this platform run the xz program?
  */
 int
-canUnxz(void)
+canXz(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unxz -V %s", redirectArgs) == 0)
+               if (systemf("xz -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/cpio/test/test.h b/cpio/test/test.h
index 6fc11d8c9daec1dd536b0e96d311a2fd5fed12f3..666bba0e8b303b277f977f10286ee19b150cc613 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -287,8 +287,8 @@ int canLzma(void);
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);
 
-/* Return true if this platform can run the "unxz" program. */
-int canUnxz(void);
+/* Return true if this platform can run the "xz" program. */
+int canXz(void);
 
 /* Return true if this filesystem can handle nodump flags. */
 int canNodump(void);

diff --git a/cpio/test/test_extract_cpio_xz.c b/cpio/test/test_extract_cpio_xz.c
index fd3c13fa5722b1e94f874bca61f2e40b575a8caf..60f1b5a9de8498c41837f91da7119922766b52d5 100644 (file)
--- a/cpio/test/test_extract_cpio_xz.c
+++ b/cpio/test/test_extract_cpio_xz.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_cpio_xz)
 
        extract_reference_file(reffile);
        f = systemf("%s -it < %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canUnxz()) {
+       if (f == 0 || canXz()) {
                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 2ba2338c6758b37b5d944ce203e56d8f5b3cd63e..95853ade36956fab818b9a9ed1f4c2cbebd004cb 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -144,7 +144,7 @@ archive_read_support_filter_xz(struct archive *_a)
        return (ARCHIVE_OK);
 #else
        archive_set_error(_a, ARCHIVE_ERRNO_MISC,
-           "Using external unxz program for xz decompression");
+           "Using external xz program for xz decompression");
        return (ARCHIVE_WARN);
 #endif
 }
@@ -958,7 +958,7 @@ xz_bidder_init(struct archive_read_filter *self)
 {
        int r;
 
-       r = __archive_read_program(self, "unxz");
+       r = __archive_read_program(self, "xz -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 c308f3cd7293ce1ea4e375db8579772169c0a9fb..8be2a14e873b6f75bef2ad0af832d6f5a7213a55 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1946,15 +1946,15 @@ canLzop(void)
 }
 
 /*
- * Can this platform run the unxz program?
+ * Can this platform run the xz program?
  */
 int
-canUnxz(void)
+canXz(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unxz -V %s", redirectArgs) == 0)
+               if (systemf("xz -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 9a208fd3f7185ae31bc401d7bd92831d580665e3..11f1737118ee6fc9ce1abd785f3ecacb76a2bc9e 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -287,8 +287,8 @@ int canLzma(void);
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);
 
-/* Return true if this platform can run the "unxz" program. */
-int canUnxz(void);
+/* Return true if this platform can run the "xz" program. */
+int canXz(void);
 
 /* Return true if this filesystem can handle nodump flags. */
 int canNodump(void);

diff --git a/tar/test/main.c b/tar/test/main.c
index 7ac577641188f54a2c4a0686c3ebf9fbbeecd607..0af1283315ffb886fc9db30920b5525129aec1df 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1948,15 +1948,15 @@ canLzop(void)
 }
 
 /*
- * Can this platform run the unxz program?
+ * Can this platform run the xz program?
  */
 int
-canUnxz(void)
+canXz(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("unxz -V %s", redirectArgs) == 0)
+               if (systemf("xz -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/tar/test/test.h b/tar/test/test.h
index 1d910c6f2d71d3f5ef1e6d56ec4ea94b94b89470..a0a9bb6f600c284262f3f83af75596a89fa40bae 100644 (file)
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -289,8 +289,8 @@ int canLzma(void);
 /* Return true if this platform can run the "lzop" program. */
 int canLzop(void);
 
-/* Return true if this platform can run the "unxz" program. */
-int canUnxz(void);
+/* Return true if this platform can run the "xz" program. */
+int canXz(void);
 
 /* Return true if this filesystem can handle nodump flags. */
 int canNodump(void);

diff --git a/tar/test/test_extract_tar_xz.c b/tar/test/test_extract_tar_xz.c
index 2edaf340106d2fd891bf7b15641e5fc425baf288..860bab75acf7fb772b7d395c45938cd665370ce9 100644 (file)
--- a/tar/test/test_extract_tar_xz.c
+++ b/tar/test/test_extract_tar_xz.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_tar_xz)
 
        extract_reference_file(reffile);
        f = systemf("%s -tf %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canUnxz()) {
+       if (f == 0 || canXz()) {
                assertEqualInt(0, systemf("%s -xf %s >test.out 2>test.err",
                    testprog, reffile));