1 files changed, 37 insertions, 33 deletions

diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c
index 307da68e9ccd3..969387e9abc25 100644
--- a/lib/libarchive/archive_read_support_compression_bzip2.c
+++ b/lib/libarchive/archive_read_support_compression_bzip2.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include "archive.h"
 #include "archive_private.h"
+#include "archive_read_private.h"
 
 #if HAVE_BZLIB_H
 struct private_data {
@@ -56,19 +57,20 @@ struct private_data {
 	int64_t		 total_out;
 };
 
-static int	finish(struct archive *);
-static ssize_t	read_ahead(struct archive *, const void **, size_t);
-static ssize_t	read_consume(struct archive *, size_t);
-static int	drive_decompressor(struct archive *a, struct private_data *);
+static int	finish(struct archive_read *);
+static ssize_t	read_ahead(struct archive_read *, const void **, size_t);
+static ssize_t	read_consume(struct archive_read *, size_t);
+static int	drive_decompressor(struct archive_read *a, struct private_data *);
 #endif
 
 /* These two functions are defined even if we lack bzlib.  See below. */
 static int	bid(const void *, size_t);
-static int	init(struct archive *, const void *, size_t);
+static int	init(struct archive_read *, const void *, size_t);
 
 int
-archive_read_support_compression_bzip2(struct archive *a)
+archive_read_support_compression_bzip2(struct archive *_a)
 {
+	struct archive_read *a = (struct archive_read *)_a;
 	return (__archive_read_register_compression(a, bid, init));
 }
 
@@ -152,19 +154,19 @@ init(struct archive *a, const void *buff, size_t n)
  * Setup the callbacks.
  */
 static int
-init(struct archive *a, const void *buff, size_t n)
+init(struct archive_read *a, const void *buff, size_t n)
 {
 	struct private_data *state;
 	int ret;
 
-	a->compression_code = ARCHIVE_COMPRESSION_BZIP2;
-	a->compression_name = "bzip2";
+	a->archive.compression_code = ARCHIVE_COMPRESSION_BZIP2;
+	a->archive.compression_name = "bzip2";
 
 	state = (struct private_data *)malloc(sizeof(*state));
 	if (state == NULL) {
-		archive_set_error(a, ENOMEM,
+		archive_set_error(&a->archive, ENOMEM,
 		    "Can't allocate data for %s decompression",
-		    a->compression_name);
+		    a->archive.compression_name);
 		return (ARCHIVE_FATAL);
 	}
 	memset(state, 0, sizeof(*state));
@@ -176,9 +178,9 @@ init(struct archive *a, const void *buff, size_t n)
 	state->stream.avail_out = state->uncompressed_buffer_size;
 
 	if (state->uncompressed_buffer == NULL) {
-		archive_set_error(a, ENOMEM,
+		archive_set_error(&a->archive, ENOMEM,
 		    "Can't allocate %s decompression buffers",
-		    a->compression_name);
+		    a->archive.compression_name);
 		free(state);
 		return (ARCHIVE_FATAL);
 	}
@@ -215,25 +217,26 @@ init(struct archive *a, const void *buff, size_t n)
 	}
 
 	/* Library setup failed: Clean up. */
-	archive_set_error(a, ARCHIVE_ERRNO_MISC,
-	    "Internal error initializing %s library", a->compression_name);
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+	    "Internal error initializing %s library",
+	    a->archive.compression_name);
 	free(state->uncompressed_buffer);
 	free(state);
 
 	/* Override the error message if we know what really went wrong. */
 	switch (ret) {
 	case BZ_PARAM_ERROR:
-		archive_set_error(a, ARCHIVE_ERRNO_MISC,
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Internal error initializing compression library: "
 		    "invalid setup parameter");
 		break;
 	case BZ_MEM_ERROR:
-		archive_set_error(a, ARCHIVE_ERRNO_MISC,
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Internal error initializing compression library: "
 		    "out of memory");
 		break;
 	case BZ_CONFIG_ERROR:
-		archive_set_error(a, ARCHIVE_ERRNO_MISC,
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Internal error initializing compression library: "
 		    "mis-compiled library");
 		break;
@@ -247,7 +250,7 @@ init(struct archive *a, const void *buff, size_t n)
  * as necessary.
  */
 static ssize_t
-read_ahead(struct archive *a, const void **p, size_t min)
+read_ahead(struct archive_read *a, const void **p, size_t min)
 {
 	struct private_data *state;
 	int read_avail, was_avail, ret;
@@ -255,7 +258,7 @@ read_ahead(struct archive *a, const void **p, size_t min)
 	state = (struct private_data *)a->compression_data;
 	was_avail = -1;
 	if (!a->client_reader) {
-		archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER,
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
 		    "No read callback is registered?  "
 		    "This is probably an internal programming error.");
 		return (ARCHIVE_FATAL);
@@ -289,12 +292,12 @@ read_ahead(struct archive *a, const void **p, size_t min)
  * Mark a previously-returned block of data as read.
  */
 static ssize_t
-read_consume(struct archive *a, size_t n)
+read_consume(struct archive_read *a, size_t n)
 {
 	struct private_data *state;
 
 	state = (struct private_data *)a->compression_data;
-	a->file_position += n;
+	a->archive.file_position += n;
 	state->read_next += n;
 	if (state->read_next > state->stream.next_out)
 		__archive_errx(1, "Request to consume too many "
@@ -306,7 +309,7 @@ read_consume(struct archive *a, size_t n)
  * Clean up the decompressor.
  */
 static int
-finish(struct archive *a)
+finish(struct archive_read *a)
 {
 	struct private_data *state;
 	int ret;
@@ -317,8 +320,9 @@ finish(struct archive *a)
 	case BZ_OK:
 		break;
 	default:
-		archive_set_error(a, ARCHIVE_ERRNO_MISC,
-		    "Failed to clean up %s compressor", a->compression_name);
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Failed to clean up %s compressor",
+		    a->archive.compression_name);
 		ret = ARCHIVE_FATAL;
 	}
 
@@ -327,7 +331,7 @@ finish(struct archive *a)
 
 	a->compression_data = NULL;
 	if (a->client_closer != NULL)
-		(a->client_closer)(a, a->client_data);
+		(a->client_closer)(&a->archive, a->client_data);
 
 	return (ret);
 }
@@ -337,7 +341,7 @@ finish(struct archive *a)
  * blocks as necessary.
  */
 static int
-drive_decompressor(struct archive *a, struct private_data *state)
+drive_decompressor(struct archive_read *a, struct private_data *state)
 {
 	ssize_t ret;
 	int decompressed, total_decompressed;
@@ -346,7 +350,7 @@ drive_decompressor(struct archive *a, struct private_data *state)
 	total_decompressed = 0;
 	for (;;) {
 		if (state->stream.avail_in == 0) {
-			ret = (a->client_reader)(a, a->client_data,
+			ret = (a->client_reader)(&a->archive, a->client_data,
 			    (const void **)&state->stream.next_in);
 			if (ret < 0) {
 				/*
@@ -356,12 +360,12 @@ drive_decompressor(struct archive *a, struct private_data *state)
 				goto fatal;
 			}
 			if (ret == 0  &&  total_decompressed == 0) {
-				archive_set_error(a, EIO,
+				archive_set_error(&a->archive, EIO,
 				    "Premature end of %s compressed data",
-				    a->compression_name);
+				    a->archive.compression_name);
 				return (ARCHIVE_FATAL);
 			}
-			a->raw_position += ret;
+			a->archive.raw_position += ret;
 			state->stream.avail_in = ret;
 		}
 
@@ -393,8 +397,8 @@ drive_decompressor(struct archive *a, struct private_data *state)
 
 	/* Return a fatal error. */
 fatal:
-	archive_set_error(a, ARCHIVE_ERRNO_MISC, "%s decompression failed",
-	    a->compression_name);
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+	    "%s decompression failed", a->archive.compression_name);
 	return (ARCHIVE_FATAL);
 }