mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-19 15:59:29 +08:00
0ffac8322f
* 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
81 lines
1.4 KiB
Java
81 lines
1.4 KiB
Java
// CheckedInputStream.java - Compute checksum of data being read.
|
|
|
|
/* 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.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 CheckedInputStream extends FilterInputStream
|
|
{
|
|
public CheckedInputStream (InputStream in, Checksum sum)
|
|
{
|
|
super (in);
|
|
this.sum = sum;
|
|
}
|
|
|
|
public Checksum getChecksum ()
|
|
{
|
|
return sum;
|
|
}
|
|
|
|
public int read () throws IOException
|
|
{
|
|
int x = in.read();
|
|
if (x != -1)
|
|
sum.update(x);
|
|
return x;
|
|
}
|
|
|
|
public int read (byte[] buf, int off, int len) throws IOException
|
|
{
|
|
int r = in.read(buf, off, len);
|
|
if (r != -1)
|
|
sum.update(buf, off, r);
|
|
return r;
|
|
}
|
|
|
|
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 = in.read(buf, 0, min);
|
|
if (r == -1)
|
|
break;
|
|
n -= r;
|
|
s += r;
|
|
sum.update(buf, 0, r);
|
|
}
|
|
|
|
return s;
|
|
}
|
|
|
|
// The checksum object.
|
|
private Checksum sum;
|
|
}
|