From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 16 Oct 2012 05:00:42 +0000 (+0900)
Subject: Perform 'bzip2 -d -V'  instead of 'bzip2 -V' for a bzip2 availableness
X-Git-Tag: v3.1.0~40^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b8607e6816cbb14b380c47c6a3071eb17266252;p=thirdparty%2Flibarchive.git

Perform 'bzip2 -d -V'  instead of 'bzip2 -V' for a bzip2 availableness
test because the process on FreeBSD 9 does not finish its program
when redirecting stdout to /dev/null.
---

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 87e925534..c123b3080 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1851,7 +1851,7 @@ canBzip2(void)
 	static int tested = 0, value = 0;
 	if (!tested) {
 		tested = 1;
-		if (systemf("bzip2 -V %s", redirectArgs) == 0)
+		if (systemf("bzip2 -d -V %s", redirectArgs) == 0)
 			value = 1;
 	}
 	return (value);
diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 8be2a14e8..c7471474c 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1849,7 +1849,7 @@ canBzip2(void)
 	static int tested = 0, value = 0;
 	if (!tested) {
 		tested = 1;
-		if (systemf("bzip2 -V %s", redirectArgs) == 0)
+		if (systemf("bzip2 -d -V %s", redirectArgs) == 0)
 			value = 1;
 	}
 	return (value);
diff --git a/tar/test/main.c b/tar/test/main.c
index 0af128331..f700f192c 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1851,7 +1851,7 @@ canBzip2(void)
 	static int tested = 0, value = 0;
 	if (!tested) {
 		tested = 1;
-		if (systemf("bzip2 -V %s", redirectArgs) == 0)
+		if (systemf("bzip2 -d -V %s", redirectArgs) == 0)
 			value = 1;
 	}
 	return (value);