f44b63ae02
* DeflaterOutputStream.java (deflate): Loop while def.needsInput. (finish): def.deflate needs to be called in a loop. (inbuf, inbufLength): New private fields. (write(int)): Use inbuf. (write(byte[],int,int): Check if pending output in inbuf. * ZipOutputStream.java: Don't use Deflater if stored. Use a Checksum object directly, not via a CheckedOutputStream. (uncompressed_size): New field, (closeEntry): Only write data_directory if needed. (write): If STORED, write directly. Always update crc, and uncompressed_size. (write_entry): Fix lots of protocol erors. From-SVN: r40988
134 lines
3.2 KiB
Java
134 lines
3.2 KiB
Java
/* DeflaterOutputStream.java - Output filter for compressing.
|
|
Copyright (C) 1999, 2000 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.
|
|
|
|
As a special exception, if you link this library with other files to
|
|
produce an executable, this library does not by itself cause the
|
|
resulting executable to be covered by the GNU General Public License.
|
|
This exception does not however invalidate any other reasons why the
|
|
executable file might be covered by the GNU General Public License. */
|
|
|
|
package java.util.zip;
|
|
|
|
import java.io.FilterOutputStream;
|
|
import java.io.OutputStream;
|
|
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 DeflaterOutputStream extends FilterOutputStream
|
|
{
|
|
public void close () throws IOException
|
|
{
|
|
finish ();
|
|
out.close();
|
|
}
|
|
|
|
protected void deflate () throws IOException
|
|
{
|
|
do
|
|
{
|
|
int len = def.deflate(buf, 0, buf.length);
|
|
if (len > 0)
|
|
out.write(buf, 0, len);
|
|
}
|
|
while (! def.needsInput());
|
|
}
|
|
|
|
public DeflaterOutputStream (OutputStream out)
|
|
{
|
|
this (out, new Deflater (), 512);
|
|
}
|
|
|
|
public DeflaterOutputStream (OutputStream out, Deflater defl)
|
|
{
|
|
this (out, defl, 512);
|
|
}
|
|
|
|
public DeflaterOutputStream(OutputStream out, Deflater defl, int bufsize)
|
|
{
|
|
super (out);
|
|
buf = new byte[bufsize];
|
|
def = defl;
|
|
}
|
|
|
|
public void finish () throws IOException
|
|
{
|
|
if (inbufLength > 0)
|
|
{
|
|
def.setInput (inbuf, 0, inbufLength);
|
|
deflate ();
|
|
inbufLength = 0;
|
|
}
|
|
def.finish();
|
|
while (! def.finished ())
|
|
{
|
|
int len = def.deflate(buf, 0, buf.length);
|
|
if (len > 0)
|
|
out.write(buf, 0, len);
|
|
}
|
|
}
|
|
|
|
public void write (int bval) throws IOException
|
|
{
|
|
if (inbuf == null)
|
|
{
|
|
inbuf = new byte[128];
|
|
}
|
|
else if (inbufLength == inbuf.length)
|
|
{
|
|
def.setInput (inbuf, 0, inbufLength);
|
|
deflate ();
|
|
inbufLength = 0;
|
|
}
|
|
inbuf[inbufLength++] = (byte) bval;
|
|
}
|
|
|
|
public void write (byte[] buf, int off, int len) throws IOException
|
|
{
|
|
if (inbufLength > 0)
|
|
{
|
|
def.setInput (inbuf, 0, inbufLength);
|
|
deflate ();
|
|
inbufLength = 0;
|
|
}
|
|
def.setInput (buf, off, len);
|
|
deflate ();
|
|
}
|
|
|
|
// Used, if needed, for write(int).
|
|
private byte[] inbuf;
|
|
// Used length of inbuf.
|
|
private int inbufLength;
|
|
|
|
// The retrieval buffer.
|
|
protected byte[] buf;
|
|
|
|
// Deflater used to compress data.
|
|
protected Deflater def;
|
|
}
|