ZipOutputStream.java (level): Initial value is Deflater.DEFAULT_COMPRESSION.

	* java/util/zip/ZipOutputStream.java (level): Initial value is
	Deflater.DEFAULT_COMPRESSION.
	(close): New method.
	(closeEntry): Likewise.
	(finish): Likewise.
	(put_version): Likewise.
	(write_entry): Likewise.
	(put2, put4): Now return `int'.
	(comment): Default to empty string.
	(bytes_written): New instance variable.
	(chain): Likewise.
	* java/util/zip/ZipEntry.java (setComment): Limit length of
	comment string.
	(setCrc): Check CRC validity.
	(setExtra): Check argument validity.
	(setMethod): Likewise.
	(setSize): Likewise.
	(ZipEntry): Likewise.
	* include/javaprims.h: Updated namespace declarations.
	* Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Mention new files.
	(nat_source_files): Likewise.
	* java/util/zip/ZipFile.java (readu2): Throw ZipException, not
	EOFException.
	(read4): Likewise.
	(getInputStream): Handle compressed entries.
	* java/util/zip/GZIPOutputStream.java: New file.
	* java/util/zip/GZIPInputStream.java: New file.
	* java/util/zip/DataFormatException.java: New file.
	* java/util/zip/CheckedInputStream.java: New file.
	* java/util/zip/CheckedOutputStream.java: New file.
	* java/util/zip/InflaterInputStream.java: Implemented.
	* java/util/zip/natInflater.cc: New file.
	* java/util/zip/Deflater.java: Implemented.
	* java/util/zip/natDeflater.cc: New file.
	* java/util/zip/DeflaterOutputStream.java: Implemented.
	* java/util/zip/ZipInputStream.java (closeZipEntry): Throw
	ZipException, not IOException.
	* java/util/zip/ZipFile.java (readDirectory): Throw ZipException,
	not IOException.

From-SVN: r26996

1 files changed, 86 insertions, 4 deletions

diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java
index 1b6290a4fc1..7ee445560f4 100644
--- a/libjava/java/util/zip/InflaterInputStream.java
+++ b/libjava/java/util/zip/InflaterInputStream.java
@@ -1,3 +1,5 @@
+// InflaterInputStream.java - Input stream filter for decompressing.
+
 /* Copyright (C) 1999  Cygnus Solutions
 
    This file is part of libgcj.
@@ -7,14 +9,94 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
 package java.util.zip;
-import java.io.*;
 
-/** Placefolder - very incomplete. */
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * @author Tom Tromey
+ * @date May 17, 1999
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification
+ * and JCL book.
+ * Believed complete and correct.
+ */
 
 public class InflaterInputStream extends FilterInputStream
 {
-  public InflaterInputStream(InputStream in)
+  protected void fill () throws IOException
+  {
+    len = in.read(buf, 0, buf.length);
+    if (len != -1)
+      inf.setInput(buf, 0, len);
+  }
+
+  public InflaterInputStream (InputStream in)
+  {
+    this (in, new Inflater (), 512);
+  }
+
+  public InflaterInputStream (InputStream in, Inflater infl)
   {
-    super(in);
+    this (in, infl, 512);
   }
+
+  public InflaterInputStream (InputStream in, Inflater infl, int bufsize)
+  {
+    super (in);
+    this.inf = infl;
+    this.buf = new byte[bufsize];
+  }
+
+  public int read () throws IOException
+  {
+    byte[] buf = new byte[1];
+    int r = read (buf, 0, 1);
+    if (r != -1)
+      r = buf[0] & 0xff;
+    return r;
+  }
+
+  public int read (byte[] buf, int off, int len) throws IOException
+  {
+    if (inf.finished())
+      return -1;
+    if (inf.needsInput())
+      fill ();
+    if (inf.needsDictionary())
+      return -1;
+    return inf.inflate(buf, off, len);
+  }
+
+  public long skip (long n) throws IOException
+  {
+    if (n == 0)
+      return 0;
+
+    int min = (int) Math.min(n, 1024);
+    byte[] buf = new byte[min];
+
+    long s = 0;
+    while (n > 0)
+      {
+	int r = read (buf, 0, min);
+	if (r == -1)
+	  break;
+	n -= r;
+	s += r;
+      }
+
+    return s;
+  }
+
+  // Buffer for delivering uncompressed data to inflater.
+  protected byte[] buf;
+
+  // Inflater used to decompress data.
+  protected Inflater inf;
+
+  // Number of read bytes in buf.
+  protected int len;
 }