PatchSet 4081
Date: 2003/09/29 11:17:19
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Merged in java/util/zip/GZIPOutputStream from GNU Classpath
Members:
ChangeLog:1.1676->1.1677
libraries/javalib/java/util/zip/GZIPOutputStream.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1676 kaffe/ChangeLog:1.1677
--- kaffe/ChangeLog:1.1676 Mon Sep 29 10:01:57 2003
+++ kaffe/ChangeLog Mon Sep 29 11:17:19 2003
@@ -1,3 +1,8 @@
+2003-09-29 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/java/util/zip/GZIPOutputStream.java:
+ Replaced by implementation from GNU Classpath.
+
2003-09-29 Helmer Kraemer <[EMAIL PROTECTED]>
* kaffe/kaffevm/mem/gc-mem.c: (gc_heap_grow) don't forget
Index: kaffe/libraries/javalib/java/util/zip/GZIPOutputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/GZIPOutputStream.java:1.3
kaffe/libraries/javalib/java/util/zip/GZIPOutputStream.java:1.4
--- kaffe/libraries/javalib/java/util/zip/GZIPOutputStream.java:1.3 Wed Sep 30
23:48:34 1998
+++ kaffe/libraries/javalib/java/util/zip/GZIPOutputStream.java Mon Sep 29 11:17:21
2003
@@ -1,78 +1,152 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1997, 1998
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
+/* java.util.zip.GZIPOutputStream
+ Copyright (C) 2001 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package java.util.zip;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
-public class GZIPOutputStream extends DeflaterOutputStream {
+/**
+ * This filter stream is used to compress a stream into a "GZIP" stream.
+ * The "GZIP" format is described in RFC 1952.
+ *
+ * @author John Leuner
+ * @since JDK 1.1
+ */
-protected CRC32 crc;
-private int count;
-private OutputStream strm;
-
-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);
- strm = out;
- crc = new CRC32();
- count = 0;
-
- /* Write GZIP header */
- writeByte(31); // GZIP identifier
- writeByte(139); // "
- writeByte(8); // Deflating
- writeByte(0); // No extra bits
- writeInt(0); // No time stamp
- writeByte(2); // Maximum compression, slowest algorithm
- writeByte(255); // Unknown OS
-}
-
-public void close() throws IOException {
- finish();
- super.close();
-}
-
-public void finish() throws IOException {
- super.finish();
- // Make sure we only do this once.
- if (count > -1) {
- writeInt((int)crc.getValue());
- writeInt(count);
- count = -1;
- }
-}
-
-private void writeInt(int v) throws IOException {
- byte[] buf = new byte[4];
- buf[0] = (byte)v;
- buf[1] = (byte)(v >> 8);
- buf[2] = (byte)(v >> 16);
- buf[3] = (byte)(v >> 24);
- strm.write(buf);
-}
-
-private void writeByte(int v) throws IOException {
- byte[] buf = new byte[1];
- buf[0] = (byte)v;
- strm.write(buf);
-}
-
-public void write(byte[] buf, int off, int len) throws IOException {
- super.write(buf, off, len);
- crc.update(buf, off, len);
- count += len;
-}
+public class GZIPOutputStream extends DeflaterOutputStream
+{
+ //Variables
+
+ /* CRC-32 value for uncompressed data
+ */
+
+ protected CRC32 crc = new CRC32();
+
+ // Constructors
+
+ /* Creates a GZIPOutputStream with the default buffer size
+ *
+ *
+ * @param out The stream to read data (to be compressed) from
+ *
+ */
+
+ public GZIPOutputStream(OutputStream out) throws IOException
+ {
+ this(out, 4096);
+ }
+
+ /* Creates a GZIPOutputStream with the specified buffer size
+ *
+ *
+ * @param out The stream to read compressed data from
+ *
+ * @param size Size of the buffer to use
+ */
+
+ public GZIPOutputStream(OutputStream out, int size) throws IOException
+ {
+ super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true), size);
+
+ int mod_time = (int) (System.currentTimeMillis() / 1000L);
+ byte[] gzipHeader =
+ {
+ /* The two magic bytes */
+ (byte) (GZIPInputStream.GZIP_MAGIC >> 8),
+ (byte) GZIPInputStream.GZIP_MAGIC,
+
+ /* The compression type */
+ (byte) Deflater.DEFLATED,
+
+ /* The flags (not set) */
+ 0,
+
+ /* The modification time */
+ (byte) mod_time, (byte) (mod_time >> 8),
+ (byte) (mod_time >> 16), (byte) (mod_time >> 24),
+
+ /* The extra flags */
+ 0,
+
+ /* The OS type (unknown) */
+ (byte) 255
+ };
+
+ out.write(gzipHeader);
+ // System.err.println("wrote GZIP header (" + gzipHeader.length + " bytes )");
+ }
+
+ public void write(byte[] buf, int off, int len) throws IOException
+ {
+ crc.update(buf, off, len);
+ super.write(buf, off, len);
+ }
+
+ /** Writes remaining compressed output data to the output stream
+ * and closes it.
+ */
+ public void close() throws IOException
+ {
+ finish();
+ out.close();
+ }
+
+ public void finish() throws IOException
+ {
+
+ super.finish();
+
+ int totalin = def.getTotalIn();
+ int crcval = (int) (crc.getValue() & 0xffffffff);
+
+ // System.err.println("CRC val is " + Integer.toHexString( crcval )
+ " and length " + Integer.toHexString(totalin));
+
+ byte[] gzipFooter =
+ {
+ (byte) crcval, (byte) (crcval >> 8),
+ (byte) (crcval >> 16), (byte) (crcval >> 24),
+
+ (byte) totalin, (byte) (totalin >> 8),
+ (byte) (totalin >> 16), (byte) (totalin >> 24)
+ };
+
+ out.write(gzipFooter);
+ // System.err.println("wrote GZIP trailer (" + gzipFooter.length + " bytes )");
+ }
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
