svn commit: r248612 - in head: usr.bin/ar usr.bin/unzip usr.sbin/bsdinstall/distextract

[Martin Matuska]

Author: mm
Date: Fri Mar 22 10:17:42 2013
New Revision: 248612
URL: http://svnweb.freebsd.org/changeset/base/248612

Log:
  Replace deprecated (or remove obsolete) libarchive 2.8 functions
  with libarchive 3.0 counterparts

Modified:
  head/usr.bin/ar/acpyacc.y
  head/usr.bin/ar/read.c
  head/usr.bin/ar/write.c
  head/usr.bin/unzip/unzip.c
  head/usr.sbin/bsdinstall/distextract/distextract.c

Modified: head/usr.bin/ar/acpyacc.y
==============================================================================
--- head/usr.bin/ar/acpyacc.y	Fri Mar 22 07:57:28 2013	(r248611)
+++ head/usr.bin/ar/acpyacc.y	Fri Mar 22 10:17:42 2013	(r248612)
@@ -249,13 +249,12 @@ arscp_open(char *fname)
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
-	AC(archive_read_open_file(a, fname, DEF_BLKSZ));
+	AC(archive_read_open_filename(a, fname, DEF_BLKSZ));
 	if ((r = archive_read_next_header(a, &entry)))
 		bsdar_warnc(bsdar, 0, "%s", archive_error_string(a));
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 	if (r != ARCHIVE_OK)
 		return;
 	arscp_create(fname, fname);
@@ -311,7 +310,7 @@ arscp_create(char *in, char *out)
 		archive_write_set_format_ar_svr4(a);
 		AC(archive_write_open_fd(a, ofd));
 		AC(archive_write_close(a));
-		AC(archive_write_finish(a));
+		AC(archive_write_free(a));
 	}
 
 	/* Override previous target, if any. */

Modified: head/usr.bin/ar/read.c
==============================================================================
--- head/usr.bin/ar/read.c	Fri Mar 22 07:57:28 2013	(r248611)
+++ head/usr.bin/ar/read.c	Fri Mar 22 10:17:42 2013	(r248612)
@@ -87,9 +87,8 @@ read_archive(struct bsdar *bsdar, char m
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
-	AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ));
+	AC(archive_read_open_filename(a, bsdar->filename, DEF_BLKSZ));
 
 	for (;;) {
 		r = archive_read_next_header(a, &entry);
@@ -200,5 +199,5 @@ read_archive(struct bsdar *bsdar, char m
 		}
 	}
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 }

Modified: head/usr.bin/ar/write.c
==============================================================================
--- head/usr.bin/ar/write.c	Fri Mar 22 07:57:28 2013	(r248611)
+++ head/usr.bin/ar/write.c	Fri Mar 22 10:17:42 2013	(r248612)
@@ -277,7 +277,6 @@ read_objs(struct bsdar *bsdar, const cha
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
 	AC(archive_read_open_filename(a, archive, DEF_BLKSZ));
 	for (;;) {
@@ -363,7 +362,7 @@ read_objs(struct bsdar *bsdar, const cha
 		TAILQ_INSERT_TAIL(&bsdar->v_obj, obj, objs);
 	}
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 }
 
 /*
@@ -628,7 +627,6 @@ write_objs(struct bsdar *bsdar)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_write_new failed");
 
 	archive_write_set_format_ar_svr4(a);
-	archive_write_set_compression_none(a);
 
 	AC(archive_write_open_filename(a, bsdar->filename));
 
@@ -682,7 +680,7 @@ write_objs(struct bsdar *bsdar)
 	}
 
 	AC(archive_write_close(a));
-	AC(archive_write_finish(a));
+	AC(archive_write_free(a));
 }
 
 /*

Modified: head/usr.bin/unzip/unzip.c
==============================================================================
--- head/usr.bin/unzip/unzip.c	Fri Mar 22 07:57:28 2013	(r248611)
+++ head/usr.bin/unzip/unzip.c	Fri Mar 22 10:17:42 2013	(r248612)
@@ -926,7 +926,7 @@ unzip(const char *fn)
 	}
 
 	ac(archive_read_close(a));
-	(void)archive_read_finish(a);
+	(void)archive_read_free(a);
 
 	if (t_opt) {
 		if (error_count > 0) {

Modified: head/usr.sbin/bsdinstall/distextract/distextract.c
==============================================================================
--- head/usr.sbin/bsdinstall/distextract/distextract.c	Fri Mar 22 07:57:28 2013	(r248611)
+++ head/usr.sbin/bsdinstall/distextract/distextract.c	Fri Mar 22 10:17:42 2013	(r248612)
@@ -126,7 +126,7 @@ count_files(const char *file)
 	/* 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) {
@@ -188,7 +188,7 @@ extract_files(int nfiles, const char **f
 	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);