Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/gzip/unbzip2.c,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/gzip/unbzip2.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1
retrieving revision 1.1.2.4
diff -u -p -r1.1 -r1.1.2.4
--- src/usr.bin/gzip/unbzip2.c	2004/01/01 02:44:09	1.1
+++ src/usr.bin/gzip/unbzip2.c	2004/05/30 14:48:32	1.1.2.4
@@ -1,22 +1,20 @@
-/*	$NetBSD: unbzip2.c,v 1.1 2004/01/01 02:44:09 mrg Exp $	*/
+/*	$NetBSD: unbzip2.c,v 1.1.2.4 2004/05/30 14:48:32 tron Exp $	*/
 
 /* This file is #included by gzip.c */
 
-#define INBUFSIZE	(64 * 1024)
-#define OUTBUFSIZE	(64 * 1024)
-
 static off_t
-unbzip2(int in, int out)
+unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
 {
-	int		n, ret, end_of_file;
+	int		ret, end_of_file;
+	size_t		n;
 	off_t		bytes_out = 0;
 	bz_stream	bzs;
-	char            *inbuf, *outbuf;
+	static char	*inbuf, *outbuf;
 
-	if ((inbuf = malloc(INBUFSIZE)) == NULL)
-	        maybe_err(1, "malloc");
-	if ((outbuf = malloc(OUTBUFSIZE)) == NULL)
-	        maybe_err(1, "malloc");
+	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;
@@ -25,51 +23,62 @@ unbzip2(int in, int out)
 	end_of_file = 0;
 	ret = BZ2_bzDecompressInit(&bzs, 0, 0);
 	if (ret != BZ_OK)
-	        maybe_errx(1, "bzip2 init");
+	        maybe_errx("bzip2 init");
+
+	/* Prepend. */
+	bzs.avail_in = prelen;
+	bzs.next_in = pre;
 
-	bzs.avail_in = 0;
+	if (bytes_in)
+		*bytes_in = prelen;
 
 	while (ret != BZ_STREAM_END) {
 	        if (bzs.avail_in == 0 && !end_of_file) {
-	                n = read(in, inbuf, INBUFSIZE);
+	                n = read(in, inbuf, BUFLEN);
 	                if (n < 0)
-	                        maybe_err(1, "read");
+	                        maybe_err("read");
 	                if (n == 0)
 	                        end_of_file = 1;
 	                bzs.next_in = inbuf;
 	                bzs.avail_in = n;
-	        } else
-	                n = 0;
+			if (bytes_in)
+				*bytes_in += n;
+	        }
 
 	        bzs.next_out = outbuf;
-	        bzs.avail_out = OUTBUFSIZE;
+	        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(1, "read");
+	                        maybe_err("read");
 	                if (!tflag) {
-	                        n = write(out, outbuf, OUTBUFSIZE - bzs.avail_out);
+	                        n = write(out, outbuf, BUFLEN - bzs.avail_out);
 	                        if (n < 0)
-	                                maybe_err(1, "write");
+	                                maybe_err("write");
 	                }
 	                bytes_out += n;
-	                if (ret == BZ_STREAM_END)
-	                        break;
+	                break;
 
 	        case BZ_DATA_ERROR:
-	                maybe_errx(1, "bzip2 data integrity error");
+	                maybe_warn("bzip2 data integrity error");
+			break;
+
 	        case BZ_DATA_ERROR_MAGIC:
-	                maybe_errx(1, "bzip2 magic number error");
+	                maybe_warn("bzip2 magic number error");
+			break;
+
 	        case BZ_MEM_ERROR:
-	                maybe_errx(1, "bzip2 out of memory");
+	                maybe_warn("bzip2 out of memory");
+			break;
+
 	        }
 	}
 
-	if (BZ2_bzDecompressEnd(&bzs) != BZ_OK)
-	        return (0);
+	if (ret != BZ_STREAM_END || BZ2_bzDecompressEnd(&bzs) != BZ_OK)
+	        return (-1);
 
 	return (bytes_out);
 }