libarchive-static 1.0.6 → 1.1.0

data/ext/{libarchive-2.8.4/libarchive/archive_write_set_compression_compress.c → libarchive-3.6.2/libarchive/archive_write_add_filter_compress.c}

@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_compress.c
 #define	CLEAR	256		/* Table clear output code. */
 
 struct private_data {
-	off_t in_count, out_count, checkpoint;
+	int64_t in_count, out_count, checkpoint;
 
 	int code_len;			/* Number of bits/code. */
 	int cur_maxcode;		/* Maximum code, given n_bits. */
@@ -108,23 +108,35 @@ struct private_data {
 	size_t		 compressed_offset;
 };
 
-static int	archive_compressor_compress_finish(struct archive_write *);
-static int	archive_compressor_compress_init(struct archive_write *);
-static int	archive_compressor_compress_write(struct archive_write *,
+static int archive_compressor_compress_open(struct archive_write_filter *);
+static int archive_compressor_compress_write(struct archive_write_filter *,
 		    const void *, size_t);
+static int archive_compressor_compress_close(struct archive_write_filter *);
+static int archive_compressor_compress_free(struct archive_write_filter *);
+
+#if ARCHIVE_VERSION_NUMBER < 4000000
+int
+archive_write_set_compression_compress(struct archive *a)
+{
+	__archive_write_filters_free(a);
+	return (archive_write_add_filter_compress(a));
+}
+#endif
 
 /*
- * Allocate, initialize and return a archive object.
+ * Add a compress filter to this write handle.
  */
 int
-archive_write_set_compression_compress(struct archive *_a)
+archive_write_add_filter_compress(struct archive *_a)
 {
 	struct archive_write *a = (struct archive_write *)_a;
-	__archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
-	    ARCHIVE_STATE_NEW, "archive_write_set_compression_compress");
-	a->compressor.init = &archive_compressor_compress_init;
-	a->archive.compression_code = ARCHIVE_COMPRESSION_COMPRESS;
-	a->archive.compression_name = "compress";
+	struct archive_write_filter *f = __archive_write_allocate_filter(_a);
+
+	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_write_add_filter_compress");
+	f->open = &archive_compressor_compress_open;
+	f->code = ARCHIVE_FILTER_COMPRESS;
+	f->name = "compress";
 	return (ARCHIVE_OK);
 }
 
@@ -132,46 +144,43 @@ archive_write_set_compression_compress(struct archive *_a)
  * Setup callback.
  */
 static int
-archive_compressor_compress_init(struct archive_write *a)
+archive_compressor_compress_open(struct archive_write_filter *f)
 {
-	int ret;
 	struct private_data *state;
+	size_t bs = 65536, bpb;
 
-	a->archive.compression_code = ARCHIVE_COMPRESSION_COMPRESS;
-	a->archive.compression_name = "compress";
+	f->code = ARCHIVE_FILTER_COMPRESS;
+	f->name = "compress";
 
-	if (a->bytes_per_block < 4) {
-		archive_set_error(&a->archive, EINVAL,
-		    "Can't write Compress header as single block");
-		return (ARCHIVE_FATAL);
-	}
-
-	if (a->client_opener != NULL) {
-		ret = (a->client_opener)(&a->archive, a->client_data);
-		if (ret != ARCHIVE_OK)
-			return (ret);
-	}
-
-	state = (struct private_data *)malloc(sizeof(*state));
+	state = (struct private_data *)calloc(1, sizeof(*state));
 	if (state == NULL) {
-		archive_set_error(&a->archive, ENOMEM,
+		archive_set_error(f->archive, ENOMEM,
 		    "Can't allocate data for compression");
 		return (ARCHIVE_FATAL);
 	}
-	memset(state, 0, sizeof(*state));
 
-	state->compressed_buffer_size = a->bytes_per_block;
+	if (f->archive->magic == ARCHIVE_WRITE_MAGIC) {
+		/* Buffer size should be a multiple number of the of bytes
+		 * per block for performance. */
+		bpb = archive_write_get_bytes_per_block(f->archive);
+		if (bpb > bs)
+			bs = bpb;
+		else if (bpb != 0)
+			bs -= bs % bpb;
+	}
+	state->compressed_buffer_size = bs;
 	state->compressed = malloc(state->compressed_buffer_size);
 
 	if (state->compressed == NULL) {
-		archive_set_error(&a->archive, ENOMEM,
+		archive_set_error(f->archive, ENOMEM,
 		    "Can't allocate data for compression buffer");
 		free(state);
 		return (ARCHIVE_FATAL);
 	}
 
-	a->compressor.write = archive_compressor_compress_write;
-	a->compressor.finish = archive_compressor_compress_finish;
+	f->write = archive_compressor_compress_write;
+	f->close = archive_compressor_compress_close;
+	f->free = archive_compressor_compress_free;
 
 	state->max_maxcode = 0x10000;	/* Should NEVER generate this code. */
 	state->in_count = 0;		/* Length of input. */
@@ -192,7 +201,7 @@ archive_compressor_compress_init(struct archive_write *a)
 	state->compressed[2] = 0x90; /* Block mode, 16bit max */
 	state->compressed_offset = 3;
 
-	a->compressor.data = state;
+	f->data = state;
 	return (0);
 }
 
@@ -200,7 +209,7 @@ archive_compressor_compress_init(struct archive_write *a)
  * Output the given code.
  * Inputs:
  * 	code:	A n_bits-bit integer.  If == -1, then EOF.  This assumes
- *		that n_bits =< (long)wordsize - 1.
+ *		that n_bits <= (long)wordsize - 1.
  * Outputs:
  * 	Outputs code to the file.
  * Assumptions:
@@ -211,25 +220,22 @@ archive_compressor_compress_init(struct archive_write *a)
  * code in turn.  When the buffer fills up empty it and start over.
  */
 
-static unsigned char rmask[9] =
+static const unsigned char rmask[9] =
 	{0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff};
 
 static int
-output_byte(struct archive_write *a, unsigned char c)
+output_byte(struct archive_write_filter *f, unsigned char c)
 {
-	struct private_data *state = a->compressor.data;
-	ssize_t bytes_written;
+	struct private_data *state = f->data;
 
 	state->compressed[state->compressed_offset++] = c;
 	++state->out_count;
 
 	if (state->compressed_buffer_size == state->compressed_offset) {
-		bytes_written = (a->client_writer)(&a->archive,
-		    a->client_data,
+		int ret = __archive_write_filter(f->next_filter,
 		    state->compressed, state->compressed_buffer_size);
-		if (bytes_written <= 0)
+		if (ret != ARCHIVE_OK)
 			return ARCHIVE_FATAL;
-		a->archive.raw_position += bytes_written;
 		state->compressed_offset = 0;
 	}
 
@@ -237,9 +243,9 @@ output_byte(struct archive_write *a, unsigned char c)
 }
 
 static int
-output_code(struct archive_write *a, int ocode)
+output_code(struct archive_write_filter *f, int ocode)
 {
-	struct private_data *state = a->compressor.data;
+	struct private_data *state = f->data;
 	int bits, ret, clear_flg, bit_offset;
 
 	clear_flg = ocode == CLEAR;
@@ -250,13 +256,13 @@ output_code(struct archive_write *a, int ocode)
 	 */
 	bit_offset = state->bit_offset % 8;
 	state->bit_buf |= (ocode << bit_offset) & 0xff;
-	output_byte(a, state->bit_buf);
+	output_byte(f, state->bit_buf);
 
 	bits = state->code_len - (8 - bit_offset);
 	ocode >>= 8 - bit_offset;
 	/* Get any 8 bit parts in the middle (<=1 for up to 16 bits). */
 	if (bits >= 8) {
-		output_byte(a, ocode & 0xff);
+		output_byte(f, ocode & 0xff);
 		ocode >>= 8;
 		bits -= 8;
 	}
@@ -277,7 +283,7 @@ output_code(struct archive_write *a, int ocode)
 		*/
 		if (state->bit_offset > 0) {
 			while (state->bit_offset < state->code_len * 8) {
-				ret = output_byte(a, state->bit_buf);
+				ret = output_byte(f, state->bit_buf);
 				if (ret != ARCHIVE_OK)
 					return ret;
 				state->bit_offset += 8;
@@ -303,15 +309,15 @@ output_code(struct archive_write *a, int ocode)
 }
 
 static int
-output_flush(struct archive_write *a)
+output_flush(struct archive_write_filter *f)
 {
-	struct private_data *state = a->compressor.data;
+	struct private_data *state = f->data;
 	int ret;
 
 	/* At EOF, write the rest of the buffer. */
 	if (state->bit_offset % 8) {
 		state->code_len = (state->bit_offset % 8 + 7) / 8;
-		ret = output_byte(a, state->bit_buf);
+		ret = output_byte(f, state->bit_buf);
 		if (ret != ARCHIVE_OK)
 			return ret;
 	}
@@ -323,23 +329,15 @@ output_flush(struct archive_write *a)
  * Write data to the compressed stream.
  */
 static int
-archive_compressor_compress_write(struct archive_write *a, const void *buff,
-    size_t length)
+archive_compressor_compress_write(struct archive_write_filter *f,
+    const void *buff, size_t length)
 {
-	struct private_data *state;
+	struct private_data *state = (struct private_data *)f->data;
 	int i;
 	int ratio;
 	int c, disp, ret;
 	const unsigned char *bp;
 
-	state = (struct private_data *)a->compressor.data;
-	if (a->client_writer == NULL) {
-		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
-		    "No write callback is registered?  "
-		    "This is probably an internal programming error.");
-		return (ARCHIVE_FATAL);
-	}
-
 	if (length == 0)
 		return ARCHIVE_OK;
 
@@ -368,7 +366,7 @@ archive_compressor_compress_write(struct archive_write *a, const void *buff,
 			disp = 1;
 		else
 			disp = HSIZE - i;
- probe:		
+ probe:
 		if ((i -= disp) < 0)
 			i += HSIZE;
 
@@ -378,8 +376,8 @@ archive_compressor_compress_write(struct archive_write *a, const void *buff,
 		}
 		if (state->hashtab[i] >= 0)
 			goto probe;
- nomatch:	
-		ret = output_code(a, state->cur_code);
+ nomatch:
+		ret = output_code(f, state->cur_code);
 		if (ret != ARCHIVE_OK)
 			return ret;
 		state->cur_code = c;
@@ -393,12 +391,12 @@ archive_compressor_compress_write(struct archive_write *a, const void *buff,
 
 		state->checkpoint = state->in_count + CHECK_GAP;
 
-		if (state->in_count <= 0x007fffff)
-			ratio = state->in_count * 256 / state->out_count;
-		else if ((ratio = state->out_count / 256) == 0)
+		if (state->in_count <= 0x007fffff && state->out_count != 0)
+			ratio = (int)(state->in_count * 256 / state->out_count);
+		else if ((ratio = (int)(state->out_count / 256)) == 0)
 			ratio = 0x7fffffff;
 		else
-			ratio = state->in_count / ratio;
+			ratio = (int)(state->in_count / ratio);
 
 		if (ratio > state->compress_ratio)
 			state->compress_ratio = ratio;
@@ -406,7 +404,7 @@ archive_compressor_compress_write(struct archive_write *a, const void *buff,
 			state->compress_ratio = 0;
 			memset(state->hashtab, 0xff, sizeof(state->hashtab));
 			state->first_free = FIRST;
-			ret = output_code(a, CLEAR);
+			ret = output_code(f, CLEAR);
 			if (ret != ARCHIVE_OK)
 				return ret;
 		}
@@ -420,73 +418,30 @@ archive_compressor_compress_write(struct archive_write *a, const void *buff,
  * Finish the compression...
  */
 static int
-archive_compressor_compress_finish(struct archive_write *a)
+archive_compressor_compress_close(struct archive_write_filter *f)
 {
-	ssize_t block_length, target_block_length, bytes_written;
+	struct private_data *state = (struct private_data *)f->data;
 	int ret;
-	struct private_data *state;
-	size_t tocopy;
-
-	state = (struct private_data *)a->compressor.data;
-	if (a->client_writer == NULL) {
-		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
-		    "No write callback is registered?  "
-		    "This is probably an internal programming error.");
-		ret = ARCHIVE_FATAL;
-		goto cleanup;
-	}
 
-	/* By default, always pad the uncompressed data. */
-	if (a->pad_uncompressed) {
-		while (state->in_count % a->bytes_per_block != 0) {
-			tocopy = a->bytes_per_block -
-			    (state->in_count % a->bytes_per_block);
-			if (tocopy > a->null_length)
-				tocopy = a->null_length;
-			ret = archive_compressor_compress_write(a, a->nulls,
-			    tocopy);
-			if (ret != ARCHIVE_OK)
-				goto cleanup;
-		}
-	}
-
-	ret = output_code(a, state->cur_code);
+	ret = output_code(f, state->cur_code);
 	if (ret != ARCHIVE_OK)
-		goto cleanup;
-	ret = output_flush(a);
+		return ret;
+	ret = output_flush(f);
 	if (ret != ARCHIVE_OK)
-		goto cleanup;
-
-	/* Optionally, pad the final compressed block. */
-	block_length = state->compressed_offset;
-
-	/* Tricky calculation to determine size of last block. */
-	if (a->bytes_in_last_block <= 0)
-		/* Default or Zero: pad to full block */
-		target_block_length = a->bytes_per_block;
-	else
-		/* Round length to next multiple of bytes_in_last_block. */
-		target_block_length = a->bytes_in_last_block *
-		    ( (block_length + a->bytes_in_last_block - 1) /
-			a->bytes_in_last_block);
-	if (target_block_length > a->bytes_per_block)
-		target_block_length = a->bytes_per_block;
-	if (block_length < target_block_length) {
-		memset(state->compressed + state->compressed_offset, 0,
-		    target_block_length - block_length);
-		block_length = target_block_length;
-	}
+		return ret;
 
 	/* Write the last block */
-	bytes_written = (a->client_writer)(&a->archive, a->client_data,
-	    state->compressed, block_length);
-	if (bytes_written <= 0)
-		ret = ARCHIVE_FATAL;
-	else
-		a->archive.raw_position += bytes_written;
-
-cleanup:
+	ret = __archive_write_filter(f->next_filter,
+	    state->compressed, state->compressed_offset);
+	return (ret);
+}
+
+static int
+archive_compressor_compress_free(struct archive_write_filter *f)
+{
+	struct private_data *state = (struct private_data *)f->data;
+
 	free(state->compressed);
 	free(state);
-	return (ret);
+	return (ARCHIVE_OK);
 }

data/ext/libarchive-3.6.2/libarchive/archive_write_add_filter_grzip.c

@@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "archive.h"
+#include "archive_write_private.h"
+
+struct write_grzip {
+	struct archive_write_program_data *pdata;
+};
+
+static int archive_write_grzip_open(struct archive_write_filter *);
+static int archive_write_grzip_options(struct archive_write_filter *,
+		    const char *, const char *);
+static int archive_write_grzip_write(struct archive_write_filter *,
+		    const void *, size_t);
+static int archive_write_grzip_close(struct archive_write_filter *);
+static int archive_write_grzip_free(struct archive_write_filter *);
+
+int
+archive_write_add_filter_grzip(struct archive *_a)
+{
+	struct archive_write_filter *f = __archive_write_allocate_filter(_a);
+	struct write_grzip *data;
+
+	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_write_add_filter_grzip");
+
+	data = calloc(1, sizeof(*data));
+	if (data == NULL) {
+		archive_set_error(_a, ENOMEM, "Can't allocate memory");
+		return (ARCHIVE_FATAL);
+	}
+	data->pdata = __archive_write_program_allocate("grzip");
+	if (data->pdata == NULL) {
+		free(data);
+		archive_set_error(_a, ENOMEM, "Can't allocate memory");
+		return (ARCHIVE_FATAL);
+	}
+
+	f->name = "grzip";
+	f->code = ARCHIVE_FILTER_GRZIP;
+	f->data = data;
+	f->open = archive_write_grzip_open;
+	f->options = archive_write_grzip_options;
+	f->write = archive_write_grzip_write;
+	f->close = archive_write_grzip_close;
+	f->free = archive_write_grzip_free;
+
+	/* Note: This filter always uses an external program, so we
+	 * return "warn" to inform of the fact. */
+	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
+	    "Using external grzip program for grzip compression");
+	return (ARCHIVE_WARN);
+}
+
+static int
+archive_write_grzip_options(struct archive_write_filter *f, const char *key,
+    const char *value)
+{
+	(void)f; /* UNUSED */
+	(void)key; /* UNUSED */
+	(void)value; /* UNUSED */
+	/* Note: The "warn" return is just to inform the options
+	 * supervisor that we didn't handle it.  It will generate
+	 * a suitable error if no one used this option. */
+	return (ARCHIVE_WARN);
+}
+
+static int
+archive_write_grzip_open(struct archive_write_filter *f)
+{
+	struct write_grzip *data = (struct write_grzip *)f->data;
+
+	return __archive_write_program_open(f, data->pdata, "grzip");
+}
+
+static int
+archive_write_grzip_write(struct archive_write_filter *f,
+    const void *buff, size_t length)
+{
+	struct write_grzip *data = (struct write_grzip *)f->data;
+
+	return __archive_write_program_write(f, data->pdata, buff, length);
+}
+
+static int
+archive_write_grzip_close(struct archive_write_filter *f)
+{
+	struct write_grzip *data = (struct write_grzip *)f->data;
+
+	return __archive_write_program_close(f, data->pdata);
+}
+
+static int
+archive_write_grzip_free(struct archive_write_filter *f)
+{
+	struct write_grzip *data = (struct write_grzip *)f->data;
+
+	__archive_write_program_free(data->pdata);
+	free(data);
+	return (ARCHIVE_OK);
+}