From: Michihiro NAKAJIMA Date: Wed, 10 Oct 2012 02:19:20 +0000 (+0900) Subject: Place canGrzip before canGzip. X-Git-Tag: v3.1.0~40^2~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ba3fa3e7943c426d5bd36f541648c59604df3c5;p=thirdparty%2Flibarchive.git Place canGrzip before canGzip. --- diff --git a/cpio/test/main.c b/cpio/test/main.c index 1eb15ac10..33b295cc3 100644 --- a/cpio/test/main.c +++ b/cpio/test/main.c @@ -1858,45 +1858,45 @@ canBunzip2(void) } /* - * Can this platform run the gzip program? + * Can this platform run the grzip program? */ int -canGzip(void) +canGrzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gzip -V %s", redirectArgs) == 0) + if (systemf("grzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the gunzip program? + * Can this platform run the gzip program? */ int -canGunzip(void) +canGzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gunzip -V %s", redirectArgs) == 0) + if (systemf("gzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the grzip program? + * Can this platform run the gunzip program? */ int -canGrzip(void) +canGunzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("grzip -V %s", redirectArgs) == 0) + if (systemf("gunzip -V %s", redirectArgs) == 0) value = 1; } return (value); diff --git a/cpio/test/test.h b/cpio/test/test.h index e218a155f..3eb0e7bc9 100644 --- a/cpio/test/test.h +++ b/cpio/test/test.h @@ -269,15 +269,15 @@ int canSymlink(void); /* Return true if this platform can run the "bunzip2" program. */ int canBunzip2(void); +/* Return true if this platform can run the "grzip" program. */ +int canGrzip(void); + /* Return true if this platform can run the "gzip" program. */ int canGzip(void); /* Return true if this platform can run the "gunzip" program. */ int canGunzip(void); -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - /* Return true if this platform can run the "lrzip" program. */ int canLrzip(void); diff --git a/libarchive/test/main.c b/libarchive/test/main.c index ac77c7d58..10cef5265 100644 --- a/libarchive/test/main.c +++ b/libarchive/test/main.c @@ -1856,45 +1856,45 @@ canBunzip2(void) } /* - * Can this platform run the gzip program? + * Can this platform run the grzip program? */ int -canGzip(void) +canGrzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gzip -V %s", redirectArgs) == 0) + if (systemf("grzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the gunzip program? + * Can this platform run the gzip program? */ int -canGunzip(void) +canGzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gunzip -V %s", redirectArgs) == 0) + if (systemf("gzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the grzip program? + * Can this platform run the gunzip program? */ int -canGrzip(void) +canGunzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("grzip -V %s", redirectArgs) == 0) + if (systemf("gunzip -V %s", redirectArgs) == 0) value = 1; } return (value); diff --git a/libarchive/test/test.h b/libarchive/test/test.h index 22942861e..d8a21b063 100644 --- a/libarchive/test/test.h +++ b/libarchive/test/test.h @@ -269,15 +269,15 @@ int canSymlink(void); /* Return true if this platform can run the "bunzip2" program. */ int canBunzip2(void); +/* Return true if this platform can run the "grzip" program. */ +int canGrzip(void); + /* Return true if this platform can run the "gzip" program. */ int canGzip(void); /* Return true if this platform can run the "gunzip" program. */ int canGunzip(void); -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - /* Return true if this platform can run the "lrzip" program. */ int canLrzip(void); diff --git a/tar/test/main.c b/tar/test/main.c index ccf83ba20..620eb3975 100644 --- a/tar/test/main.c +++ b/tar/test/main.c @@ -1858,45 +1858,45 @@ canBunzip2(void) } /* - * Can this platform run the gzip program? + * Can this platform run the grzip program? */ int -canGzip(void) +canGrzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gzip -V %s", redirectArgs) == 0) + if (systemf("grzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the gunzip program? + * Can this platform run the gzip program? */ int -canGunzip(void) +canGzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("gunzip -V %s", redirectArgs) == 0) + if (systemf("gzip -V %s", redirectArgs) == 0) value = 1; } return (value); } /* - * Can this platform run the grzip program? + * Can this platform run the gunzip program? */ int -canGrzip(void) +canGunzip(void) { static int tested = 0, value = 0; if (!tested) { tested = 1; - if (systemf("grzip -V %s", redirectArgs) == 0) + if (systemf("gunzip -V %s", redirectArgs) == 0) value = 1; } return (value); diff --git a/tar/test/test.h b/tar/test/test.h index 36ff42e08..d27e868d0 100644 --- a/tar/test/test.h +++ b/tar/test/test.h @@ -271,15 +271,15 @@ int canSymlink(void); /* Return true if this platform can run the "bunzip2" program. */ int canBunzip2(void); +/* Return true if this platform can run the "grzip" program. */ +int canGrzip(void); + /* Return true if this platform can run the "gzip" program. */ int canGzip(void); /* Return true if this platform can run the "gunzip" program. */ int canGunzip(void); -/* Return true if this platform can run the "grzip" program. */ -int canGrzip(void); - /* Return true if this platform can run the "lrzip" program. */ int canLrzip(void);