Switch an external program for lzip decompression from "lunzip" to

"lzip -d".

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 6db2b420a2953bcc19c74950eec2400b1f330b56..889847ed73365a62e4cedba210b876f0a55928cf 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1903,15 +1903,15 @@ canLrzip(void)
 }
 
 /*
- * Can this platform run the lunzip program?
+ * Can this platform run the lzip program?
  */
 int
-canLunzip(void)
+canLzip(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("lunzip -V %s", redirectArgs) == 0)
+               if (systemf("lzip -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/cpio/test/test.h b/cpio/test/test.h
index a15b8e92eb8107a06a388476c3cbe3ebbbb72837..823d65414b93da06071c61b537e7591eb9844c27 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -278,8 +278,8 @@ int canGzip(void);
 /* Return true if this platform can run the "lrzip" program. */
 int canLrzip(void);
 
-/* Return true if this platform can run the "lunzip" program. */
-int canLunzip(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);

diff --git a/cpio/test/test_extract_cpio_lz.c b/cpio/test/test_extract_cpio_lz.c
index d0ed24b21e6ac091e2f80100498447847c16044a..4454e7b191e94f07566d08f575f411a4c3917935 100644 (file)
--- a/cpio/test/test_extract_cpio_lz.c
+++ b/cpio/test/test_extract_cpio_lz.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_cpio_lz)
 
        extract_reference_file(reffile);
        f = systemf("%s -it < %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canLunzip()) {
+       if (f == 0 || canLzip()) {
                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 f51df255bfdbcec020114367c51d2495196104f5..fa6ae3fb78185d65d3b320fd382dc8926e8d23ce 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -972,7 +972,7 @@ lzip_bidder_init(struct archive_read_filter *self)
 {
        int r;
 
-       r = __archive_read_program(self, "lunzip");
+       r = __archive_read_program(self, "lzip -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 7a85b114de55766b580c929e12134622bec51b62..de988c0df724fb354cb20a472d9cc11c782c1481 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1901,15 +1901,15 @@ canLrzip(void)
 }
 
 /*
- * Can this platform run the lunzip program?
+ * Can this platform run the lzip program?
  */
 int
-canLunzip(void)
+canLzip(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("lunzip -V %s", redirectArgs) == 0)
+               if (systemf("lzip -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index e72a94a84332f870072a0d00161db26b80778d96..9c6d7e6c680528c7652e4f8b98568ffd1bfd5002 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -278,8 +278,8 @@ int canGzip(void);
 /* Return true if this platform can run the "lrzip" program. */
 int canLrzip(void);
 
-/* Return true if this platform can run the "lunzip" program. */
-int canLunzip(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);

diff --git a/tar/test/main.c b/tar/test/main.c
index 4234dc17b8f2096c2f32aec58c61ccd5ef5aef8f..e0b15dc7300c0c2ffc269bf21283428e345e62fb 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1903,15 +1903,15 @@ canLrzip(void)
 }
 
 /*
- * Can this platform run the lunzip program?
+ * Can this platform run the lzip program?
  */
 int
-canLunzip(void)
+canLzip(void)
 {
        static int tested = 0, value = 0;
        if (!tested) {
                tested = 1;
-               if (systemf("lunzip -V %s", redirectArgs) == 0)
+               if (systemf("lzip -V %s", redirectArgs) == 0)
                        value = 1;
        }
        return (value);

diff --git a/tar/test/test.h b/tar/test/test.h
index 1ad7bc1fa449f82d31de017cf336e69e9978a8ef..d5a55cfb19714bc23d707b6b920dd260a3450024 100644 (file)
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -280,8 +280,8 @@ int canGzip(void);
 /* Return true if this platform can run the "lrzip" program. */
 int canLrzip(void);
 
-/* Return true if this platform can run the "lunzip" program. */
-int canLunzip(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);

diff --git a/tar/test/test_extract_tar_lz.c b/tar/test/test_extract_tar_lz.c
index d1caca8e50f1e62f1955b7589681477a8ce25dbe..5ec7e9a48f2fd7ce779b782ac3c4be430b135725 100644 (file)
--- a/tar/test/test_extract_tar_lz.c
+++ b/tar/test/test_extract_tar_lz.c
@@ -32,7 +32,7 @@ DEFINE_TEST(test_extract_tar_lz)
 
        extract_reference_file(reffile);
        f = systemf("%s -tf %s >test.out 2>test.err", testprog, reffile);
-       if (f == 0 || canLunzip()) {
+       if (f == 0 || canLzip()) {
                assertEqualInt(0, systemf("%s -xf %s >test.out 2>test.err",
                    testprog, reffile));