diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-18 15:33:03 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-18 15:33:03 +0000 |
| commit | e3b4a43d3b394f8009bdae0960c9e3240f8cf736 (patch) | |
| tree | c538fe74824c64ba74944a357c354f0c77e93be5 /libjava/java/util/zip/ZipInputStream.java | |
| parent | addd693c880eb9310e8229fbbb4a37df4f550367 (diff) | |
| download | ppe42-gcc-e3b4a43d3b394f8009bdae0960c9e3240f8cf736.tar.gz ppe42-gcc-e3b4a43d3b394f8009bdae0960c9e3240f8cf736.zip | |
* 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
Diffstat (limited to 'libjava/java/util/zip/ZipInputStream.java')
| -rw-r--r-- | libjava/java/util/zip/ZipInputStream.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java index 851289638af..f2e042b8faf 100644 --- a/libjava/java/util/zip/ZipInputStream.java +++ b/libjava/java/util/zip/ZipInputStream.java @@ -168,14 +168,14 @@ public class ZipInputStream extends InflaterInputStream { int sig = read4(); if (sig != 0x04034b50) - throw new IOException("bad/missing magic number at end of .zip entry"); + throw new ZipException("bad/missing magic number at end of .zip entry"); int crc = read4(); int compressedSize = read4(); int uncompressedSize = read4(); if (current.compressedSize != compressedSize || current.size != uncompressedSize || current.crc != crc) - throw new IOException("bad data descriptor at end of .zip entry"); + throw new ZipException("bad data descriptor at end of .zip entry"); } current = null; avail = 0; |
