From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 14 Oct 2012 05:00:04 +0000 (+0900)
Subject: Switch an external program for lzip decompression from "lunzip" to
X-Git-Tag: v3.1.0~40^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa19d2720aef965e88d297f5c58cac556c41f03;p=thirdparty%2Flibarchive.git

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 6db2b420a..889847ed7 100644
--- 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 a15b8e92e..823d65414 100644
--- 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 d0ed24b21..4454e7b19 100644
--- 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 f51df255b..fa6ae3fb7 100644
--- 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 7a85b114d..de988c0df 100644
--- 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 e72a94a84..9c6d7e6c6 100644
--- 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 4234dc17b..e0b15dc73 100644
--- 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 1ad7bc1fa..d5a55cfb1 100644
--- 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 d1caca8e5..5ec7e9a48 100644
--- 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));