2d5e05af49
- fix any decompression on corrupted gzip files. PR#25508 - ask to overwrite files if we have a tty, rather than failing the operation. PR#25509. - clean up maybe_err()/maybe_warn(): use maybe_err() only for fatal errors. maybe_warn() is for processing errors. this allows "gzip -d file1.gz file2.gz" to decompress file2.gz even if file1.gz is corrupted, etc. - change the internal compressor/decompressor API to return "-1" on failure, not 0. this allows for 0-sized files to be decompressed correctly.
85 lines
2.0 KiB
C
85 lines
2.0 KiB
C
/* $NetBSD: unbzip2.c,v 1.5 2004/05/25 04:34:40 mrg Exp $ */
|
|
|
|
/* This file is #included by gzip.c */
|
|
|
|
static off_t
|
|
unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
|
|
{
|
|
int ret, end_of_file;
|
|
size_t n;
|
|
off_t bytes_out = 0;
|
|
bz_stream bzs;
|
|
static char *inbuf, *outbuf;
|
|
|
|
if (inbuf == NULL && (inbuf = malloc(BUFLEN)) == NULL)
|
|
maybe_err("malloc");
|
|
if (outbuf == NULL && (outbuf = malloc(BUFLEN)) == NULL)
|
|
maybe_err("malloc");
|
|
|
|
bzs.bzalloc = NULL;
|
|
bzs.bzfree = NULL;
|
|
bzs.opaque = NULL;
|
|
|
|
end_of_file = 0;
|
|
ret = BZ2_bzDecompressInit(&bzs, 0, 0);
|
|
if (ret != BZ_OK)
|
|
maybe_errx("bzip2 init");
|
|
|
|
/* Prepend. */
|
|
bzs.avail_in = prelen;
|
|
bzs.next_in = pre;
|
|
|
|
if (bytes_in)
|
|
*bytes_in = prelen;
|
|
|
|
while (ret != BZ_STREAM_END) {
|
|
if (bzs.avail_in == 0 && !end_of_file) {
|
|
n = read(in, inbuf, BUFLEN);
|
|
if (n < 0)
|
|
maybe_err("read");
|
|
if (n == 0)
|
|
end_of_file = 1;
|
|
bzs.next_in = inbuf;
|
|
bzs.avail_in = n;
|
|
if (bytes_in)
|
|
*bytes_in += n;
|
|
}
|
|
|
|
bzs.next_out = outbuf;
|
|
bzs.avail_out = BUFLEN;
|
|
ret = BZ2_bzDecompress(&bzs);
|
|
|
|
switch (ret) {
|
|
case BZ_STREAM_END:
|
|
case BZ_OK:
|
|
if (ret == BZ_OK && end_of_file)
|
|
maybe_err("read");
|
|
if (!tflag) {
|
|
n = write(out, outbuf, BUFLEN - bzs.avail_out);
|
|
if (n < 0)
|
|
maybe_err("write");
|
|
}
|
|
bytes_out += n;
|
|
break;
|
|
|
|
case BZ_DATA_ERROR:
|
|
maybe_warn("bzip2 data integrity error");
|
|
break;
|
|
|
|
case BZ_DATA_ERROR_MAGIC:
|
|
maybe_warn("bzip2 magic number error");
|
|
break;
|
|
|
|
case BZ_MEM_ERROR:
|
|
maybe_warn("bzip2 out of memory");
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
if (ret != BZ_STREAM_END || BZ2_bzDecompressEnd(&bzs) != BZ_OK)
|
|
return (-1);
|
|
|
|
return (bytes_out);
|
|
}
|