(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
+1999-05-22 Tom Tromey <tromey@cygnus.com>
+
+ * 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.
+
1999-05-21 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
// True if finished.
private boolean is_finished;
- // Total number of bytes made available at last setInput.
- private int last_input_count;
-
// `Flush' flag to pass to next call to deflate.
private int flush_flag;
}
// True if dictionary needed.
private boolean dict_needed;
-
- // Total number of bytes made available at last setInput.
- private int last_input_count;
}
public class ZipInputStream extends InflaterInputStream
{
- ZipEntry current;
- int current_flags;
- int avail;
-
public ZipInputStream (InputStream in)
{
- super(in);
+ super (in, new Inflater (true));
}
public ZipEntry getNextEntry () throws IOException
entry.time = ZipEntry.timeFromDOS(moddate, modtime);
current = entry;
avail = uncompressedSize;
+ compressed_bytes = compressedSize;
return entry;
}
+ // We override fill to let us control how much data gets read from
+ // the underlying input stream. This lets us avoid having to push
+ // back data.
+ protected void fill () throws IOException
+ {
+ int count = buf.length;
+ if (count > compressed_bytes)
+ count = compressed_bytes;
+ len = in.read(buf, 0, count);
+ if (len != -1)
+ {
+ compressed_bytes -= len;
+ inf.setInput(buf, 0, len);
+ }
+ }
+
public int read (byte[] b, int off, int len) throws IOException
{
if (len > avail)
len = avail;
- int count = super.read(b, off, len);
- if (count > 0)
+ int count;
+ if (current.method == Deflater.DEFLATED)
+ count = super.read(b, off, len);
+ else
+ count = in.read(b, off, len);
+ if (count == -1 || avail == 0)
+ {
+ inf.reset();
+ count = -1;
+ }
+ else
avail -= count;
return count;
}
{
if (n > avail)
n = avail;
- long count = super.skip(n);
+ long count;
+ if (current.method == Deflater.DEFLATED)
+ count = super.skip(n);
+ else
+ count = in.skip(n);
avail = avail - (int) count;
return count;
}
current = null;
super.close();
}
+
+ private ZipEntry current;
+ private int current_flags;
+ // Number of uncompressed bytes to be read.
+ private int avail;
+ // Number of bytes we can read from underlying stream.
+ private int compressed_bytes;
}
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;
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
- return s->avail_in - last_input_count == 0;
+ return s->avail_in == 0;
}
void
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;
}
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
- return s->avail_in - last_input_count;
+ return s->avail_in;
}
jint
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;
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;
}