+ * If the OPEN_DELETE mode is specified, the ZIP or JAR file will be deleted + * at some time after it has been opened and before it is closed or the + * Virtual Machine exits. + *
+ * Note:The OPEN_DELETE mode is currently unimplemented in this + * library. * * @since JDK1.3 - * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE + * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE. * - * @exception IOException if a i/o error occured. - * @exception ZipException if the file doesn't contain a valid zip - * archive. + * @exception IOException If an i/o error occured. + * @exception ZipException If the file doesn't contain a valid ZIP or JAR + * archive. */ - public ZipFile(File file, int mode) throws ZipException, IOException + public ZipFile(File file, final int mode) throws ZipException, IOException { - if (mode != OPEN_READ && mode != (OPEN_READ | OPEN_DELETE)) - throw new IllegalArgumentException("invalid mode"); - if ((mode & OPEN_DELETE) != 0) - file.deleteOnExit(); - this.raf = new RandomAccessFile(file, "r"); - this.name = file.getPath(); - checkZipFile(); + this(file, mode, DEFAULT_CHARSET); } - private void checkZipFile() throws IOException, ZipException + /** + * Opens a Zip file with the given name for reading. + *
+ * Note: This constructor is not part of the JDK API! + * + * @param charSet The character set to use for entry names and comments. + * + * @exception IOException If an i/o error occured. + * @exception ZipException If the file doesn't contain a valid ZIP or JAR + * archive. + */ + public ZipFile(final String name, final String charSet) + throws ZipException, IOException, UnsupportedEncodingException { + this(new File(name), OPEN_READ, charSet); + } + + /** + * Opens a Zip file reading the given File. + *
+ * Note: This constructor is not part of the JDK API! + * + * @param charSet The character set to use for entry names and comments. + * + * @exception IOException If an i/o error occured. + * @exception ZipException If the file doesn't contain a valid ZIP or JAR + * archive. + */ + public ZipFile(final File file, final String charSet) + throws ZipException, IOException, UnsupportedEncodingException { + this(file, OPEN_READ, charSet); + } + + /** + * Opens the given ZIP or JAR file in the given mode. + *
+ * If the OPEN_DELETE mode is specified, the ZIP or JAR file will be deleted + * at some time after it has been opened and before it is closed or the + * Virtual Machine exits. + *
+ * Note:The OPEN_DELETE mode is currently unimplemented in this + * library. + *
+ * Note: This constructor is not part of the JDK API!
+ *
+ * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE.
+ * @param charSet The character set to use for entry names and comments.
+ *
+ * @exception IOException If an i/o error occured.
+ * @exception ZipException If the file doesn't contain a valid ZIP or JAR
+ * archive.
+ */
+ public ZipFile(final File file, final int mode, final String charSet)
+ throws ZipException, IOException, UnsupportedEncodingException {
+ if ((mode & OPEN_DELETE) != 0)
+ {
+ throw new IllegalArgumentException
+
+ ("OPEN_DELETE mode not supported yet in ZipFile");
+ }
+ this.raf = new RandomAccessFile(file, "r");
+ this.name = file.getPath();
+ this.charSet = charSet;
+ new String("").getBytes(charSet); // Fail-fast
+ try {
+ //checkZipFile(); // Does not help in many cases of corrupted ZIP files.
+ this.entries = readEntries();
+ }
+ catch (IOException failure) {
+ // Don't forget to release our resources even on failure!
+ try { close(); }
+ catch (IOException ignore) { }
+ throw failure;
+ }
+ }
+
+ /*private void checkZipFile() throws IOException, ZipException
{
+ raf.seek(0);
byte[] magicBuf = new byte[4];
raf.read(magicBuf);
if (readLeInt(magicBuf, 0) != LOCSIG)
{
- raf.close();
- throw new ZipException("Not a valid zip file");
+ throw new ZipException("Not a valid ZIP or JAR file: " + name);
}
- }
-
- /**
- * Checks if file is closed and throws an exception.
- */
- private void checkClosed()
- {
- if (closed)
- throw new IllegalStateException("ZipFile has closed: " + name);
- }
+ }*/
/**
* Read an unsigned short in little endian byte order from the given
@@ -172,7 +237,7 @@
* @exception IOException if a i/o error occured.
* @exception EOFException if the file ends prematurely
*/
- private int readLeShort(DataInput di, byte[] b) throws IOException
+ private final int readLeShort(DataInput di, byte[] b) throws IOException
{
di.readFully(b, 0, 2);
return (b[0] & 0xff) | (b[1] & 0xff) << 8;
@@ -189,11 +254,11 @@
* @exception IOException if a i/o error occured.
* @exception EOFException if the file ends prematurely
*/
- private int readLeInt(DataInput di, byte[] b) throws IOException
+ private final long readLeInt(DataInput di, byte[] b) throws IOException
{
di.readFully(b, 0, 4);
- return ((b[0] & 0xff) | (b[1] & 0xff) << 8)
- | ((b[2] & 0xff) | (b[3] & 0xff) << 8) << 16;
+ return ((b[0] & 0xffL) | (b[1] & 0xffL) << 8)
+ | ((b[2] & 0xffL) | (b[3] & 0xffL) << 8) << 16;
}
/**
@@ -204,7 +269,7 @@
* @param off the offset to read from.
* @return The value read.
*/
- private int readLeShort(byte[] b, int off)
+ private final int readLeShort(byte[] b, int off)
{
return (b[off] & 0xff) | (b[off+1] & 0xff) << 8;
}
@@ -217,37 +282,40 @@
* @param off the offset to read from.
* @return The value read.
*/
- private int readLeInt(byte[] b, int off)
+ private final long readLeInt(byte[] b, int off)
{
- return ((b[off] & 0xff) | (b[off+1] & 0xff) << 8)
- | ((b[off+2] & 0xff) | (b[off+3] & 0xff) << 8) << 16;
+ return ((b[off] & 0xffL) | (b[off+1] & 0xffL) << 8)
+ | ((b[off+2] & 0xffL) | (b[off+3] & 0xffL) << 8) << 16;
}
-
/**
- * Read the central directory of a zip file and fill the entries
- * array. This is called exactly once when first needed. It is called
- * while holding the lock on raf.
+ * Read the central directory of a zip file and return the entries.
+ * This is called exactly once from the constructor in order to implement
+ * fail-fast-behaviour.
*
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the central directory is malformed
+ * @return A HashMap containing all ZIP entries.
+ * It's keys are entry name strings and its values are ZipEntry
+ * objects.
+ *
+ * @exception IOException If an i/o error occured.
+ * @exception ZipException If the central directory is malformed.
*/
- private void readEntries() throws ZipException, IOException
+ private HashMap readEntries() throws ZipException, IOException
{
- /* Search for the End Of Central Directory. When a zip comment is
+ /* Search for the End Of Central Directory. When a zip comment is
* present the directory may start earlier.
- * FIXME: This searches the whole file in a very slow manner if the
- * file isn't a zip file.
*/
long pos = raf.length() - ENDHDR;
byte[] ebs = new byte[CENHDR];
+ int centralDirOffset = 0;
do
{
- if (pos < 0)
+ if (pos < 0 || centralDirOffset > 0xffff)
throw new ZipException
- ("central directory not found, probably not a zip file: " + name);
+ ("Central directory not found, probably not a zip file: " + name);
raf.seek(pos--);
+ centralDirOffset++;
}
while (readLeInt(raf, ebs) != ENDSIG);
@@ -256,9 +324,9 @@
int count = readLeShort(raf, ebs);
if (raf.skipBytes(ENDOFF - ENDSIZ) != ENDOFF - ENDSIZ)
throw new EOFException(name);
- int centralOffset = readLeInt(raf, ebs);
+ long centralOffset = readLeInt(raf, ebs);
- entries = new HashMap(count+count/2);
+ HashMap entries = new HashMap(count + count / 4);
raf.seek(centralOffset);
byte[] buffer = new byte[16];
@@ -269,28 +337,35 @@
throw new ZipException("Wrong Central Directory signature: " + name);
int method = readLeShort(ebs, CENHOW);
- int dostime = readLeInt(ebs, CENTIM);
- int crc = readLeInt(ebs, CENCRC);
- int csize = readLeInt(ebs, CENSIZ);
- int size = readLeInt(ebs, CENLEN);
+ long dostime = readLeInt(ebs, CENTIM);
+ long crc = readLeInt(ebs, CENCRC);
+ long csize = readLeInt(ebs, CENSIZ);
+ long size = readLeInt(ebs, CENLEN);
int nameLen = readLeShort(ebs, CENNAM);
int extraLen = readLeShort(ebs, CENEXT);
int commentLen = readLeShort(ebs, CENCOM);
- int offset = readLeInt(ebs, CENOFF);
+ long offset = readLeInt(ebs, CENOFF);
int needBuffer = Math.max(nameLen, commentLen);
if (buffer.length < needBuffer)
buffer = new byte[needBuffer];
raf.readFully(buffer, 0, nameLen);
- String name = new String(buffer, 0, 0, nameLen);
+
+ String name;
+ try {
+ name = new String(buffer, 0, nameLen, charSet);
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
ZipEntry entry = new ZipEntry(name);
entry.setMethod(method);
- entry.setCrc(crc & 0xffffffffL);
- entry.setSize(size & 0xffffffffL);
- entry.setCompressedSize(csize & 0xffffffffL);
+ entry.setCrc(crc);
+ entry.setSize(size);
+ entry.setCompressedSize(csize);
entry.setDOSTime(dostime);
if (extraLen > 0)
{
@@ -301,106 +376,89 @@
if (commentLen > 0)
{
raf.readFully(buffer, 0, commentLen);
- entry.setComment(new String(buffer, 0, commentLen));
+ try {
+ entry.setComment(new String(buffer, 0, commentLen, charSet));
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
}
entry.offset = offset;
entries.put(name, entry);
}
+
+ return entries;
}
/**
- * Closes the ZipFile. This also closes all input streams given by
- * this class. After this is called, no further method should be
+ * Closes the ZipFile. This also closes all input streams given by
+ * this class. After this is called, no further method should be
* called.
*
- * @exception IOException if a i/o error occured.
+ * @exception IOException If an i/o error occured.
*/
public void close() throws IOException
{
+ if (closed)
+ return;
synchronized (raf)
{
+ if (raf != null) // Condition not required, but fail-safe
+ raf.close();
+ if (entries != null) // Guard against call from constructor
+ entries.clear();
closed = true;
- entries = null;
- raf.close();
}
}
- /**
- * Calls the close() method when this ZipFile has not yet
- * been explicitly closed.
+ /*/
+ * Ensures that the ZIP or JAR file is open.
+ *
+ * @exception IllegalStateException If the ZIP or JAR file has already been
+ * closed.
*/
- protected void finalize() throws IOException
+ private final void ensureOpen()
{
- if (!closed && raf != null) close();
+ if (closed)
+ throw new IllegalStateException("ZIP or JAR file has already been closed: " + name);
}
-
+
/**
- * Returns an enumeration of all Zip entries in this Zip file.
- *
- * @exception IllegalStateException when the ZipFile has already been closed
+ * Calls the close() method.
*/
- public Enumeration entries()
+ protected void finalize() throws IOException
{
- checkClosed();
-
- try
- {
- return new ZipEntryEnumeration(getEntries().values().iterator());
- }
- catch (IOException ioe)
- {
- return EmptyEnumeration.getInstance();
- }
+ close();
}
/**
- * Checks that the ZipFile is still open and reads entries when necessary.
+ * Returns an enumeration of all Zip entries in this ZIP or JAR file.
*
- * @exception IllegalStateException when the ZipFile has already been closed.
- * @exception IOEexception when the entries could not be read.
+ * @exception IllegalStateException If the ZIP or JAR file has already been
+ * closed.
*/
- private HashMap getEntries() throws IOException
- {
- synchronized(raf)
- {
- checkClosed();
-
- if (entries == null)
- readEntries();
+ public Enumeration entries()
+ {
+ ensureOpen();
+ return new ZipEntryEnumeration(entries.values().iterator());
+ }
- return entries;
- }
- }
/**
* Searches for a zip entry in this archive with the given name.
*
- * @param the name. May contain directory components separated by
- * slashes ('/').
- * @return the zip entry, or null if no entry with that name exists.
+ * @param name May contain directory components separated by slashes ('/').
+ * @return The zip entry, or null if no entry with that name exists.
*
- * @exception IllegalStateException when the ZipFile has already been closed
+ * @exception IllegalStateException If the ZipFile has already been closed.
*/
public ZipEntry getEntry(String name)
{
- checkClosed();
-
- try
- {
- HashMap entries = getEntries();
- ZipEntry entry = (ZipEntry) entries.get(name);
- // If we didn't find it, maybe it's a directory.
- if (entry == null && !name.endsWith("/"))
- entry = (ZipEntry) entries.get(name + '/');
- return entry != null ? new ZipEntry(entry, name) : null;
- }
- catch (IOException ioe)
- {
- return null;
- }
+ ensureOpen();
+ ZipEntry entry = (ZipEntry) entries.get(name);
+ return entry != null ? (ZipEntry) entry.clone() : null;
}
-
//access should be protected by synchronized(raf)
private byte[] locBuf = new byte[LOCHDR];
@@ -429,7 +487,7 @@
throw new ZipException("Compression method mismatch: " + name);
if (entry.getName().length() != readLeShort(locBuf, LOCNAM))
- throw new ZipException("file name length mismatch: " + name);
+ throw new ZipException("File name length mismatch: " + name);
int extraLen = entry.getName().length() + readLeShort(locBuf, LOCEXT);
return entry.offset + LOCHDR + extraLen;
@@ -460,9 +518,31 @@
*/
public InputStream getInputStream(ZipEntry entry) throws IOException
{
- checkClosed();
+ return getInputStream(entry, new Inflater(true));
+ }
+
+ /**
+ * This is the actual implementation of address@hidden #getInputStream(ZipEntry)}
+ * - it allows you to specify a custom Inflater.
+ *
+ * Warning: This method is not part of the JDK API and + * should only be used if you absolutely know what you're doing! It is very + * easy to corrupt your input if you provide this method with the wrong + * parameters! + * + * @param entry The entry to create an InputStream for. + * @param inf An inflater with nowrap set to true. + * + * @return the input stream. + * + * @throws IOException If a i/o error occured. + * @throws ZipException If the Zip archive is malformed. + * @throws IllegalStateException If the ZIP file has been closed. + */ + protected final InputStream getInputStream(ZipEntry entry, InflaterIf inf) + throws IOException { + ensureOpen(); - HashMap entries = getEntries(); String name = entry.getName(); ZipEntry zipEntry = (ZipEntry) entries.get(name); if (zipEntry == null) @@ -477,7 +557,7 @@ case ZipOutputStream.STORED: return is; case ZipOutputStream.DEFLATED: - return new InflaterInputStream(is, new Inflater(true)); + return new PaddedInflaterInputStream(is, inf); default: throw new ZipException("Unknown compression method " + method); } @@ -492,22 +572,14 @@ } /** - * Returns the number of entries in this zip file. + * Returns the number of entries in this ZIP or JAR file. * - * @exception IllegalStateException when the ZipFile has already been closed + * @exception IllegalStateException If the ZipFile has already been closed. */ public int size() { - checkClosed(); - - try - { - return getEntries().size(); - } - catch (IOException ioe) - { - return 0; - } + ensureOpen(); + return entries.size(); } private static class ZipEntryEnumeration implements Enumeration @@ -592,4 +664,30 @@ return amount; } } + + /** + * Provides an extra "dummy" byte at the end of the input stream for + * address@hidden InflaterInputStream#fill()} + * as required by Sun's address@hidden Inflater#Inflater(boolean nowrap)}. + */ + private static class PaddedInflaterInputStream extends InflaterInputStream { + + private boolean eof; + + public PaddedInflaterInputStream(InputStream in, InflaterIf inf) { + super(in, inf); + } + + protected void fill() throws IOException { + if (eof) + throw new EOFException("Unexpected end of ZLIB input stream"); + if ((len = in.read(buf, 0, buf.length)) == -1) { + // Provide dummy byte + buf[0] = 0; + len = 1; + eof = true; + } + inf.setInput(buf, 0, len); + } + } } Index: java/util/zip/ZipInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipInputStream.java,v retrieving revision 1.14 diff -u -r1.14 ZipInputStream.java --- java/util/zip/ZipInputStream.java 22 Oct 2004 18:02:06 -0000 1.14 +++ java/util/zip/ZipInputStream.java 4 May 2005 02:16:36 -0000 @@ -41,6 +41,7 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; +import java.io.UnsupportedEncodingException; /** * This is a FilterInputStream that reads the files in an zip archive @@ -51,25 +52,79 @@ * It includes support for STORED and DEFLATED entries. * * @author Jochen Hoenicke + * @author Christian Schlichtherle Added new constructors to support different + * character sets used to encode international entry names and comments. + * Added constructors to support different CRC32 and Inflater + * implementations. + * Fixed some bugs: Noteably the 2 GB Bug, so that Jazzlib now + * supports 4 GB which is the maximum with the ZIP32 format. + * Minor performance enhancements are also implemented. */ public class ZipInputStream extends InflaterInputStream implements ZipConstants { - private CRC32 crc = new CRC32(); + private final CRC32If crc; private ZipEntry entry = null; - private int csize; - private int size; + private long csize; + private long size; private int method; private int flags; private int avail; private boolean entryAtEOF; + private final String charSet; + /** * Creates a new Zip input stream, reading a zip archive. */ - public ZipInputStream(InputStream in) - { - super(in, new Inflater(true)); + public ZipInputStream(final InputStream in) { + this(in, new Inflater(true), new CRC32()); + } + + /** + * Creates a new Zip input stream, reading a zip archive. + * + * @param inf An inflater with nowrap set to true. + * @param crc The CRC23 to use. + */ + protected ZipInputStream(final InputStream in, + final InflaterIf inf, + final CRC32If crc) { + super(in, inf); + this.charSet = DEFAULT_CHARSET; + this.crc = crc; + } + + /** + * Creates a new Zip input stream, reading a zip archive. + *
+ * Warning: This constructor is not part of the JDK API! + * + * @param charSet The character set to use for entry names. + */ + public ZipInputStream(final InputStream in, final String charSet) + throws UnsupportedEncodingException { + this(in, charSet, new Inflater(true), new CRC32()); + } + + /** + * Creates a new Zip input stream, reading a zip archive. + *
+ * Warning: This constructor is not part of the JDK API! + * + * @param charSet The character set to use for entry names. + * @param inf An inflater with nowrap set to true. + * @param crc The CRC23 to use. + */ + protected ZipInputStream(final InputStream in, + final String charSet, + final InflaterIf inf, + final CRC32If crc) + throws UnsupportedEncodingException { + super(in, inf); + this.charSet = charSet; + new String("").getBytes(charSet); // Fail-fast + this.crc = crc; } private void fillBuf() throws IOException @@ -106,7 +161,7 @@ } } - private int readLeByte() throws IOException + private final int readLeByte() throws IOException { if (avail <= 0) { @@ -120,7 +175,7 @@ /** * Read an unsigned short in little endian byte order. */ - private int readLeShort() throws IOException + private final int readLeShort() throws IOException { return readLeByte() | (readLeByte() << 8); } @@ -128,9 +183,9 @@ /** * Read an int in little endian byte order. */ - private int readLeInt() throws IOException + private final long readLeInt() throws IOException { - return readLeShort() | (readLeShort() << 16); + return readLeShort() | ((long) readLeShort() << 16); } /** @@ -144,7 +199,7 @@ if (entry != null) closeEntry(); - int header = readLeInt(); + long header = readLeInt(); if (header == CENSIG) { /* Central Header reached. */ @@ -153,13 +208,13 @@ } if (header != LOCSIG) throw new ZipException("Wrong Local header signature: " - + Integer.toHexString(header)); + + Long.toHexString(header)); /* skip version */ readLeShort(); flags = readLeShort(); method = readLeShort(); - int dostime = readLeInt(); - int crc = readLeInt(); + long dostime = readLeInt(); + long crc = readLeInt(); csize = readLeInt(); size = readLeInt(); int nameLen = readLeShort(); @@ -171,16 +226,23 @@ byte[] buffer = new byte[nameLen]; readFully(buffer); - String name = new String(buffer); + //String name = new String(buffer); + String name; + try { + name = new String(buffer, 0, nameLen, charSet); + } + catch (UnsupportedEncodingException cause) { + throw new AssertionError(cause); + } entry = createZipEntry(name); entryAtEOF = false; entry.setMethod(method); if ((flags & 8) == 0) { - entry.setCrc(crc & 0xffffffffL); - entry.setSize(size & 0xffffffffL); - entry.setCompressedSize(csize & 0xffffffffL); + entry.setCrc(crc); + entry.setSize(size); + entry.setCompressedSize(csize); } entry.setDOSTime(dostime); if (extraLen > 0) @@ -204,11 +266,11 @@ { if (readLeInt() != EXTSIG) throw new ZipException("Data descriptor signature not found"); - entry.setCrc(readLeInt() & 0xffffffffL); + entry.setCrc(readLeInt()); csize = readLeInt(); size = readLeInt(); - entry.setSize(size & 0xffffffffL); - entry.setCompressedSize(csize & 0xffffffffL); + entry.setSize(size); + entry.setCompressedSize(csize); } /** @@ -226,7 +288,7 @@ if ((flags & 8) != 0) { /* We don't know how much we must skip, read until end. */ - byte[] tmp = new byte[2048]; + byte[] tmp = new byte[4096]; while (read(tmp) > 0) ; /* read will close this entry */ @@ -244,7 +306,7 @@ avail = 0; while (csize != 0) { - long skipped = in.skip(csize & 0xffffffffL); + long skipped = in.skip(csize); if (skipped <= 0) throw new ZipException("zip archive ends early."); csize -= skipped; @@ -316,8 +378,8 @@ case ZipOutputStream.STORED: - if (len > csize && csize >= 0) - len = csize; + if ((long) len > csize && csize >= 0) + len = (int) csize; len = readBuf(b, off, len); if (len > 0) @@ -338,7 +400,7 @@ if (finished) { - if ((crc.getValue() & 0xffffffffL) != entry.getCrc()) + if (crc.getValue() != entry.getCrc()) throw new ZipException("CRC mismatch"); crc.reset(); entry = null; @@ -354,7 +416,7 @@ public void close() throws IOException { super.close(); - crc = null; + crc.reset(); entry = null; entryAtEOF = true; } Index: java/util/zip/ZipOutputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipOutputStream.java,v retrieving revision 1.9 diff -u -r1.9 ZipOutputStream.java --- java/util/zip/ZipOutputStream.java 22 Oct 2004 18:02:07 -0000 1.9 +++ java/util/zip/ZipOutputStream.java 4 May 2005 02:16:37 -0000 @@ -42,6 +42,7 @@ import java.io.OutputStream; import java.util.Enumeration; import java.util.Vector; +import java.io.UnsupportedEncodingException; /** * This is a FilterOutputStream that writes the files into a zip @@ -54,11 +55,18 @@ * This class is not thread safe. * * @author Jochen Hoenicke + * @author Christian Schlichtherle Added new constructors to support different + * character sets used to encode international entry names and comments. + * Added constructors to support different CRC32 and Deflater + * implementations. + * Fixed some bugs: Noteably the 2 GB Bug, so that Jazzlib now + * supports 4 GB which is the maximum with the ZIP32 format. + * Minor performance enhancements are also implemented. */ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { private Vector entries = new Vector(); - private CRC32 crc = new CRC32(); + private final CRC32If crc; private ZipEntry curEntry = null; private int curMethod; @@ -68,6 +76,8 @@ private byte[] zipComment = new byte[0]; private int defaultMethod = DEFLATED; + private final String charSet; + /** * Our Zip version is hard coded to 1.0 resp. 2.0 */ @@ -86,11 +96,69 @@ /** * Creates a new Zip output stream, writing a zip archive. - * @param out the output stream to which the zip archive is written. + * + * @param out The output stream to which the zip archive is written. */ - public ZipOutputStream(OutputStream out) - { - super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true)); + public ZipOutputStream(final OutputStream out) { + this(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true), new CRC32()); + } + + /** + * Creates a new Zip output stream, writing a zip archive. + *
+ * Warning: This constructor is not part of the JDK API and + * should only be used if you absolutely know what you're doing! It is very + * easy to corrupt your ZIP files if you provide this method with the wrong + * parameters! + * + * @param out The output stream to which the zip archive is written. + * @param def A deflater with nowrap set to true. + * @param crc The CRC23 to use. + */ + protected ZipOutputStream(final OutputStream out, + final DeflaterIf def, + final CRC32If crc) { + super(out, def); + this.charSet = DEFAULT_CHARSET; + this.crc = crc; + } + + /** + * Creates a new Zip output stream, writing a zip archive. + *
+ * Warning: This constructor is not part of the JDK API! + * + * @param out The output stream to which the zip archive is written. + * @param charSet The character set to use for entry names and comments. + */ + public ZipOutputStream(final OutputStream out, final String charSet) + throws UnsupportedEncodingException { + this(out, charSet, + new Deflater(Deflater.DEFAULT_COMPRESSION, true), new CRC32()); + } + + /** + * Creates a new Zip output stream, writing a zip archive. + *
+ * Warning: This method is not part of the JDK API and
+ * should only be used if you absolutely know what you're doing! It is very
+ * easy to corrupt your ZIP files if you provide this method with the wrong
+ * parameters!
+ *
+ * @param out The output stream to which the zip archive is written.
+ * @param charSet The character set to use for entry names and comments.
+ * @param def A deflater with nowrap set to true.
+ * @param crc The CRC23 to use.
+ */
+ protected ZipOutputStream(final OutputStream out,
+ final String charSet,
+ final DeflaterIf def,
+ final CRC32If crc)
+ throws UnsupportedEncodingException {
+ super(out, def);
+ this.charSet = charSet;
+ new String("").getBytes(charSet); // Fail-fast
+ this.crc = crc;
}
/**
@@ -102,7 +170,12 @@
public void setComment(String comment)
{
byte[] commentBytes;
- commentBytes = comment.getBytes();
+ try {
+ commentBytes = comment.getBytes(charSet);
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
if (commentBytes.length > 0xffff)
throw new IllegalArgumentException("Comment too long.");
zipComment = commentBytes;
@@ -137,7 +210,7 @@
/**
* Write an unsigned short in little endian byte order.
*/
- private void writeLeShort(int value) throws IOException
+ private final void writeLeShort(int value) throws IOException
{
out.write(value & 0xff);
out.write((value >> 8) & 0xff);
@@ -146,10 +219,10 @@
/**
* Write an int in little endian byte order.
*/
- private void writeLeInt(int value) throws IOException
+ private final void writeLeInt(long value) throws IOException
{
- writeLeShort(value);
- writeLeShort(value >> 16);
+ writeLeShort((int) (value & 0xffff));
+ writeLeShort((int) ((value >> 16) & 0xffff));
}
/**
@@ -216,9 +289,9 @@
writeLeInt(entry.getDOSTime());
if ((flags & 8) == 0)
{
- writeLeInt((int)entry.getCrc());
- writeLeInt((int)entry.getCompressedSize());
- writeLeInt((int)entry.getSize());
+ writeLeInt(entry.getCrc());
+ writeLeInt(entry.getCompressedSize());
+ writeLeInt(entry.getSize());
}
else
{
@@ -226,7 +299,13 @@
writeLeInt(0);
writeLeInt(0);
}
- byte[] name = entry.getName().getBytes();
+ byte[] name;
+ try {
+ name = entry.getName().getBytes(charSet);
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
if (name.length > 0xffff)
throw new ZipException("Name too long.");
byte[] extra = entry.getExtra();
@@ -289,9 +368,9 @@
if (curMethod == DEFLATED && (curEntry.flags & 8) != 0)
{
writeLeInt(EXTSIG);
- writeLeInt((int)curEntry.getCrc());
- writeLeInt((int)curEntry.getCompressedSize());
- writeLeInt((int)curEntry.getSize());
+ writeLeInt(curEntry.getCrc());
+ writeLeInt(curEntry.getCompressedSize());
+ writeLeInt(curEntry.getSize());
offset += EXTHDR;
}
@@ -339,10 +418,10 @@
int numEntries = 0;
int sizeEntries = 0;
- Enumeration e = entries.elements();
- while (e.hasMoreElements())
+ Enumeration enumeration = entries.elements();
+ while (enumeration.hasMoreElements())
{
- ZipEntry entry = (ZipEntry) e.nextElement();
+ ZipEntry entry = (ZipEntry) enumeration.nextElement();
int method = entry.getMethod();
writeLeInt(CENSIG);
@@ -353,19 +432,31 @@
writeLeShort(entry.flags);
writeLeShort(method);
writeLeInt(entry.getDOSTime());
- writeLeInt((int)entry.getCrc());
- writeLeInt((int)entry.getCompressedSize());
- writeLeInt((int)entry.getSize());
-
- byte[] name = entry.getName().getBytes();
+ writeLeInt(entry.getCrc());
+ writeLeInt(entry.getCompressedSize());
+ writeLeInt(entry.getSize());
+
+ byte[] name;
+ try {
+ name = entry.getName().getBytes(charSet);
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
if (name.length > 0xffff)
throw new ZipException("Name too long.");
byte[] extra = entry.getExtra();
if (extra == null)
extra = new byte[0];
String strComment = entry.getComment();
- byte[] comment = strComment != null
- ? strComment.getBytes() : new byte[0];
+ byte[] comment;
+ try {
+ comment = strComment != null
+ ? strComment.getBytes(charSet) : new byte[0];
+ }
+ catch (UnsupportedEncodingException cause) {
+ throw new AssertionError(cause);
+ }
if (comment.length > 0xffff)
throw new ZipException("Comment too long.");
Index: lib/jazzlib/makeJazzlibDist.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/jazzlib/makeJazzlibDist.sh,v
retrieving revision 1.5
diff -u -r1.5 makeJazzlibDist.sh
--- lib/jazzlib/makeJazzlibDist.sh 13 May 2004 12:50:14 -0000 1.5
+++ lib/jazzlib/makeJazzlibDist.sh 4 May 2005 02:16:57 -0000
@@ -12,7 +12,7 @@
echo "----- Do rm -rf dist when you're finished -----"
echo "----- 30 May 2002 John Leuner