[Midnightbsd-cvs] src [7284] trunk/usr.sbin/bsdinstall/distextract/distextract.c: properly fix

[laffer1 at midnightbsd.org]

Revision: 7284
          http://svnweb.midnightbsd.org/src/?rev=7284
Author:   laffer1
Date:     2015-08-30 11:00:54 -0400 (Sun, 30 Aug 2015)
Log Message:
-----------
properly fix

Modified Paths:
--------------
    trunk/usr.sbin/bsdinstall/distextract/distextract.c

Modified: trunk/usr.sbin/bsdinstall/distextract/distextract.c
===================================================================
--- trunk/usr.sbin/bsdinstall/distextract/distextract.c	2015-08-28 22:08:52 UTC (rev 7283)
+++ trunk/usr.sbin/bsdinstall/distextract/distextract.c	2015-08-30 15:00:54 UTC (rev 7284)
@@ -34,11 +34,6 @@
 #include <archive.h>
 #include <dialog.h>
 
-#if __MidnightBSD_version <= 7004
-#define archive_read_support_filter_all(x) \
-	archive_read_support_compression_all(x)
-#endif
-
 static int extract_files(int nfiles, const char **files);
 
 int
@@ -132,7 +127,7 @@
 	/* Either we didn't have a manifest, or this archive wasn't there */
 	archive = archive_read_new();
 	archive_read_support_format_all(archive);
-	archive_read_support_compression_all(archive);
+	archive_read_support_filter_all(archive);
 	sprintf(path, "%s/%s", getenv("BSDINSTALL_DISTDIR"), file);
 	err = archive_read_open_filename(archive, path, 4096);
 	if (err != ARCHIVE_OK) {
@@ -194,7 +189,7 @@
 	for (i = 0; i < nfiles; i++) {
 		archive = archive_read_new();
 		archive_read_support_format_all(archive);
-		archive_read_support_compression_all(archive);
+		archive_read_support_filter_all(archive);
 		sprintf(path, "%s/%s", getenv("BSDINSTALL_DISTDIR"), files[i]);
 		err = archive_read_open_filename(archive, path, 4096);