* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26996 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 88 insertions, 0 deletions

diff --git a/libjava/java/util/zip/GZIPOutputStream.java b/libjava/java/util/zip/GZIPOutputStream.java
new file mode 100644
index 00000000000..1d93fd17d0c
--- /dev/null
+++ b/libjava/java/util/zip/GZIPOutputStream.java
@@ -0,0 +1,88 @@
+// GZIPOutputStream.java - Create a file in gzip format.
+
+/* Copyright (C) 1999  Cygnus Solutions
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+package java.util.zip;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * @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 GZIPOutputStream extends DeflaterOutputStream
+{
+  public void close () throws IOException
+  {
+    finish ();
+    out.close ();
+  }
+
+  public void finish () throws IOException
+  {
+    super.finish();
+    put4 ((int) crc.getValue());
+    put4 (def.getTotalIn());
+  }
+
+  public GZIPOutputStream (OutputStream out) throws IOException
+  {
+    this (out, 512);
+  }
+
+  public GZIPOutputStream (OutputStream out, int readsize) throws IOException
+  {
+    super (out, new Deflater (Deflater.DEFAULT_COMPRESSION, true), readsize);
+
+    put2 (GZIPInputStream.GZIP_MAGIC);
+    out.write (GZIPInputStream.Z_DEFLATED);
+    // No flags for now.
+    out.write (0);
+    // No time either.
+    put2 (0);
+    put2 (0);
+    // No xflags either.
+    out.write (0);
+    // FIXME: unknown OS.
+    out.write (255);
+
+    crc = new CRC32 ();
+  }
+
+  public synchronized void write (byte[] buf, int off, int len)
+    throws IOException
+  {
+    super.write(buf, off, len);
+    crc.update(buf, off, len);
+  }
+
+  private final void put2 (int i) throws IOException
+  {
+    out.write (i);
+    out.write (i >> 8);
+  }
+
+  private final void put4 (int i) throws IOException
+  {
+    out.write (i);
+    out.write (i >> 8);
+    out.write (i >> 16);
+    out.write (i >> 24);
+  }
+
+  // Checksum used by this stream.
+  protected CRC32 crc;
+}