754b92f9b9
all the install media used the 'SMALL' variant, but this is not the case. Redo the percentage print code to reduce the size to less than the old version. Fix another fd leakage (didn't call fclose() if ferror() returned non-zero. Change some maybe_warn() to maybe_warnx() in places I'm sure errno is undefined. Call mayber_warn() earlier in other paths so that errno might still be valid. Make the SMALL and NO_BZIP/COMPRESS_SUPPORT options all compile with WARNS=3.
87 lines
2.0 KiB
C
87 lines
2.0 KiB
C
/* $NetBSD: unbzip2.c,v 1.6 2004/09/05 21:32:30 dsl 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);
|
|
if (outbuf == NULL)
|
|
outbuf = malloc(BUFLEN);
|
|
if (inbuf == NULL || outbuf == 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_warnx("bzip2 data integrity error");
|
|
break;
|
|
|
|
case BZ_DATA_ERROR_MAGIC:
|
|
maybe_warnx("bzip2 magic number error");
|
|
break;
|
|
|
|
case BZ_MEM_ERROR:
|
|
maybe_warnx("bzip2 out of memory");
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
if (ret != BZ_STREAM_END || BZ2_bzDecompressEnd(&bzs) != BZ_OK)
|
|
return (-1);
|
|
|
|
return (bytes_out);
|
|
}
|