From 5128a3111fc77771864dcf70c872d7ac7bf835e4 Mon Sep 17 00:00:00 2001 From: tromey Date: Sat, 22 May 1999 18:08:46 +0000 Subject: * java/util/zip/ZipInputStream.java (fill): New method. (compressed_len): New instance variable. (getNextStream): Set it. (read): Reset inflater on EOF. Only read via `super' if entry is deflated. (skip): Only skip via `super' if entry is deflated. * java/util/zip/Deflater.java (last_input_count): Removed. * java/util/zip/natDeflater.cc (deflate): Return 0 if input array is length 0. (needsInput): Don't use last_input_count. (setInput): Don't set last_input_count. * java/util/zip/natInflater.cc (getRemaining): Return correct result. (inflate): Return 0 if input array is length 0. (setInput): Don't set last_input_count. * java/util/zip/Inflater.java (last_input_count): Removed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27105 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/zip/natInflater.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libjava/java/util/zip/natInflater.cc') diff --git a/libjava/java/util/zip/natInflater.cc b/libjava/java/util/zip/natInflater.cc index 4b83835e662..6fc9e3deaab 100644 --- a/libjava/java/util/zip/natInflater.cc +++ b/libjava/java/util/zip/natInflater.cc @@ -68,7 +68,7 @@ java::util::zip::Inflater::getRemaining () { JvSynchronize sync (this); z_streamp s = (z_streamp) zstream; - return s->avail_in - last_input_count; + return s->avail_in; } jint @@ -98,6 +98,9 @@ java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len) if (off < 0 || len < 0 || off + len > buf->length) _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + if (len == 0) + return 0; + s->next_out = (Bytef *) (elements (buf) + off); s->avail_out = len; @@ -169,7 +172,6 @@ java::util::zip::Inflater::setInput (jbyteArray buf, jint off, jint len) if (off < 0 || len < 0 || off + len > buf->length) _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); - last_input_count = len; s->next_in = (Bytef *) (elements (buf) + off); s->avail_in = len; } -- cgit v1.2.3