Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5152] trunk/core/src
|
From: <chr...@us...> - 2009-03-25 11:00:32
|
Revision: 5152
http://jnode.svn.sourceforge.net/jnode/?rev=5152&view=rev
Author: chrisboertien
Date: 2009-03-25 11:00:27 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
More implementation of java.util.zip native methods
Added Paths:
-----------
trunk/core/src/openjdk/java/java/util/zip/DataFormatException.java
trunk/core/src/openjdk/java/java/util/zip/ZipConstants.java
trunk/core/src/openjdk/java/java/util/zip/ZipEntry.java
trunk/core/src/openjdk/java/java/util/zip/ZipException.java
trunk/core/src/openjdk/java/java/util/zip/ZipFile.java
trunk/core/src/openjdk/java/java/util/zip/ZipInputStream.java
trunk/core/src/openjdk/java/java/util/zip/ZipOutputStream.java
trunk/core/src/openjdk/java/java/util/zip/package.html
trunk/core/src/openjdk/vm/java/util/zip/NativeZipEntry.java
trunk/core/src/openjdk/vm/java/util/zip/NativeZipFile.java
trunk/core/src/openjdk/vm/java/util/zip/PartialInputStream.java
trunk/core/src/openjdk/vm/java/util/zip/StructCache.java
trunk/core/src/openjdk/vm/java/util/zip/ZipEntryStruct.java
trunk/core/src/openjdk/vm/java/util/zip/ZipFileStruct.java
trunk/core/src/openjdk/vm/java/util/zip/ZipUtil.java
Removed Paths:
-------------
trunk/core/src/classpath/java/java/util/zip/DataFormatException.java
trunk/core/src/classpath/java/java/util/zip/ZipConstants.java
trunk/core/src/classpath/java/java/util/zip/ZipEntry.java
trunk/core/src/classpath/java/java/util/zip/ZipException.java
trunk/core/src/classpath/java/java/util/zip/ZipFile.java
trunk/core/src/classpath/java/java/util/zip/ZipInputStream.java
trunk/core/src/classpath/java/java/util/zip/ZipOutputStream.java
trunk/core/src/classpath/java/java/util/zip/package.html
Deleted: trunk/core/src/classpath/java/java/util/zip/DataFormatException.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/DataFormatException.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/DataFormatException.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,71 +0,0 @@
-/* DataformatException.java -- thrown when compressed data is corrupt
- Copyright (C) 1999, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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;
-
-/**
- * Exception thrown when compressed data is corrupt.
- *
- * @author Tom Tromey
- * @author John Leuner
- * @since 1.1
- * @status updated to 1.4
- */
-public class DataFormatException extends Exception
-{
- /**
- * Compatible with JDK 1.1+.
- */
- private static final long serialVersionUID = 2219632870893641452L;
-
- /**
- * Create an exception without a message.
- */
- public DataFormatException()
- {
- }
-
- /**
- * Create an exception with a message.
- *
- * @param msg the message
- */
- public DataFormatException(String msg)
- {
- super(msg);
- }
-}
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipConstants.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipConstants.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipConstants.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,94 +0,0 @@
-/* java.util.zip.ZipConstants
- Copyright (C) 2001, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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;
-
-interface ZipConstants
-{
- /* The local file header */
- int LOCHDR = 30;
- long LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
-
- int LOCVER = 4;
- int LOCFLG = 6;
- int LOCHOW = 8;
- int LOCTIM = 10;
- int LOCCRC = 14;
- int LOCSIZ = 18;
- int LOCLEN = 22;
- int LOCNAM = 26;
- int LOCEXT = 28;
-
- /* The Data descriptor */
- long EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
- int EXTHDR = 16;
-
- int EXTCRC = 4;
- int EXTSIZ = 8;
- int EXTLEN = 12;
-
- /* The central directory file header */
- long CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
- int CENHDR = 46;
-
- int CENVEM = 4;
- int CENVER = 6;
- int CENFLG = 8;
- int CENHOW = 10;
- int CENTIM = 12;
- int CENCRC = 16;
- int CENSIZ = 20;
- int CENLEN = 24;
- int CENNAM = 28;
- int CENEXT = 30;
- int CENCOM = 32;
- int CENDSK = 34;
- int CENATT = 36;
- int CENATX = 38;
- int CENOFF = 42;
-
- /* The entries in the end of central directory */
- long ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
- int ENDHDR = 22;
-
- int ENDSUB = 8;
- int ENDTOT = 10;
- int ENDSIZ = 12;
- int ENDOFF = 16;
- int ENDCOM = 20;
-}
-
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipEntry.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipEntry.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipEntry.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,431 +0,0 @@
-/* ZipEntry.java --
- Copyright (C) 2001, 2002, 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.util.Calendar;
-
-/**
- * This class represents a member of a zip archive. ZipFile and
- * ZipInputStream will give you instances of this class as information
- * about the members in an archive. On the other hand ZipOutputStream
- * needs an instance of this class to create a new member.
- *
- * @author Jochen Hoenicke
- */
-public class ZipEntry implements ZipConstants, Cloneable
-{
- private static final int KNOWN_SIZE = 1;
- private static final int KNOWN_CSIZE = 2;
- private static final int KNOWN_CRC = 4;
- private static final int KNOWN_TIME = 8;
- private static final int KNOWN_EXTRA = 16;
-
- private static Calendar cal;
-
- private String name;
- private int size;
- private long compressedSize = -1;
- private int crc;
- private int dostime;
- private short known = 0;
- private short method = -1;
- private byte[] extra = null;
- private String comment = null;
-
- int flags; /* used by ZipOutputStream */
- int offset; /* used by ZipFile and ZipOutputStream */
-
- /**
- * Compression method. This method doesn't compress at all.
- */
- public static final int STORED = 0;
- /**
- * Compression method. This method uses the Deflater.
- */
- public static final int DEFLATED = 8;
-
- /**
- * Creates a zip entry with the given name.
- * @param name the name. May include directory components separated
- * by '/'.
- *
- * @exception NullPointerException when name is null.
- * @exception IllegalArgumentException when name is bigger then 65535 chars.
- */
- public ZipEntry(String name)
- {
- int length = name.length();
- if (length > 65535)
- throw new IllegalArgumentException("name length is " + length);
- this.name = name;
- }
-
- /**
- * Creates a copy of the given zip entry.
- * @param e the entry to copy.
- */
- public ZipEntry(ZipEntry e)
- {
- this(e, e.name);
- }
-
- ZipEntry(ZipEntry e, String name)
- {
- this.name = name;
- known = e.known;
- size = e.size;
- compressedSize = e.compressedSize;
- crc = e.crc;
- dostime = e.dostime;
- method = e.method;
- extra = e.extra;
- comment = e.comment;
- }
-
- final void setDOSTime(int dostime)
- {
- this.dostime = dostime;
- known |= KNOWN_TIME;
- }
-
- final int getDOSTime()
- {
- if ((known & KNOWN_TIME) == 0)
- return 0;
- else
- return dostime;
- }
-
- /**
- * Creates a copy of this zip entry.
- */
- /**
- * Clones the entry.
- */
- public Object clone()
- {
- try
- {
- // The JCL says that the `extra' field is also copied.
- ZipEntry clone = (ZipEntry) super.clone();
- if (extra != null)
- clone.extra = (byte[]) extra.clone();
- return clone;
- }
- catch (CloneNotSupportedException ex)
- {
- throw new InternalError();
- }
- }
-
- /**
- * Returns the entry name. The path components in the entry are
- * always separated by slashes ('/').
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * Sets the time of last modification of the entry.
- * @time the time of last modification of the entry.
- */
- public void setTime(long time)
- {
- Calendar cal = getCalendar();
- synchronized (cal)
- {
- cal.setTimeInMillis(time);
- dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25
- | (cal.get(Calendar.MONTH) + 1) << 21
- | (cal.get(Calendar.DAY_OF_MONTH)) << 16
- | (cal.get(Calendar.HOUR_OF_DAY)) << 11
- | (cal.get(Calendar.MINUTE)) << 5
- | (cal.get(Calendar.SECOND)) >> 1;
- }
- this.known |= KNOWN_TIME;
- }
-
- /**
- * Gets the time of last modification of the entry.
- * @return the time of last modification of the entry, or -1 if unknown.
- */
- public long getTime()
- {
- // The extra bytes might contain the time (posix/unix extension)
- parseExtra();
-
- if ((known & KNOWN_TIME) == 0)
- return -1;
-
- int sec = 2 * (dostime & 0x1f);
- int min = (dostime >> 5) & 0x3f;
- int hrs = (dostime >> 11) & 0x1f;
- int day = (dostime >> 16) & 0x1f;
- int mon = ((dostime >> 21) & 0xf) - 1;
- int year = ((dostime >> 25) & 0x7f) + 1980; /* since 1900 */
-
- try
- {
- cal = getCalendar();
- synchronized (cal)
- {
- cal.set(year, mon, day, hrs, min, sec);
- return cal.getTimeInMillis();
- }
- }
- catch (RuntimeException ex)
- {
- /* Ignore illegal time stamp */
- known &= ~KNOWN_TIME;
- return -1;
- }
- }
-
- private static synchronized Calendar getCalendar()
- {
- if (cal == null)
- cal = Calendar.getInstance();
-
- return cal;
- }
-
- /**
- * Sets the size of the uncompressed data.
- * @exception IllegalArgumentException if size is not in 0..0xffffffffL
- */
- public void setSize(long size)
- {
- if ((size & 0xffffffff00000000L) != 0)
- throw new IllegalArgumentException();
- this.size = (int) size;
- this.known |= KNOWN_SIZE;
- }
-
- /**
- * Gets the size of the uncompressed data.
- * @return the size or -1 if unknown.
- */
- public long getSize()
- {
- return (known & KNOWN_SIZE) != 0 ? size & 0xffffffffL : -1L;
- }
-
- /**
- * Sets the size of the compressed data.
- */
- public void setCompressedSize(long csize)
- {
- this.compressedSize = csize;
- }
-
- /**
- * Gets the size of the compressed data.
- * @return the size or -1 if unknown.
- */
- public long getCompressedSize()
- {
- return compressedSize;
- }
-
- /**
- * Sets the crc of the uncompressed data.
- * @exception IllegalArgumentException if crc is not in 0..0xffffffffL
- */
- public void setCrc(long crc)
- {
- if ((crc & 0xffffffff00000000L) != 0)
- throw new IllegalArgumentException();
- this.crc = (int) crc;
- this.known |= KNOWN_CRC;
- }
-
- /**
- * Gets the crc of the uncompressed data.
- * @return the crc or -1 if unknown.
- */
- public long getCrc()
- {
- return (known & KNOWN_CRC) != 0 ? crc & 0xffffffffL : -1L;
- }
-
- /**
- * Sets the compression method. Only DEFLATED and STORED are
- * supported.
- * @exception IllegalArgumentException if method is not supported.
- * @see ZipOutputStream#DEFLATED
- * @see ZipOutputStream#STORED
- */
- public void setMethod(int method)
- {
- if (method != ZipOutputStream.STORED
- && method != ZipOutputStream.DEFLATED)
- throw new IllegalArgumentException();
- this.method = (short) method;
- }
-
- /**
- * Gets the compression method.
- * @return the compression method or -1 if unknown.
- */
- public int getMethod()
- {
- return method;
- }
-
- /**
- * Sets the extra data.
- * @exception IllegalArgumentException if extra is longer than 0xffff bytes.
- */
- public void setExtra(byte[] extra)
- {
- if (extra == null)
- {
- this.extra = null;
- return;
- }
- if (extra.length > 0xffff)
- throw new IllegalArgumentException();
- this.extra = extra;
- }
-
- private void parseExtra()
- {
- // Already parsed?
- if ((known & KNOWN_EXTRA) != 0)
- return;
-
- if (extra == null)
- {
- known |= KNOWN_EXTRA;
- return;
- }
-
- try
- {
- int pos = 0;
- while (pos < extra.length)
- {
- int sig = (extra[pos++] & 0xff)
- | (extra[pos++] & 0xff) << 8;
- int len = (extra[pos++] & 0xff)
- | (extra[pos++] & 0xff) << 8;
- if (sig == 0x5455)
- {
- /* extended time stamp */
- int flags = extra[pos];
- if ((flags & 1) != 0)
- {
- long time = ((extra[pos+1] & 0xff)
- | (extra[pos+2] & 0xff) << 8
- | (extra[pos+3] & 0xff) << 16
- | (extra[pos+4] & 0xff) << 24);
- setTime(time);
- }
- }
- pos += len;
- }
- }
- catch (ArrayIndexOutOfBoundsException ex)
- {
- /* be lenient */
- }
-
- known |= KNOWN_EXTRA;
- return;
- }
-
- /**
- * Gets the extra data.
- * @return the extra data or null if not set.
- */
- public byte[] getExtra()
- {
- return extra;
- }
-
- /**
- * Sets the entry comment.
- * @exception IllegalArgumentException if comment is longer than 0xffff.
- */
- public void setComment(String comment)
- {
- if (comment != null && comment.length() > 0xffff)
- throw new IllegalArgumentException();
- this.comment = comment;
- }
-
- /**
- * Gets the comment.
- * @return the comment or null if not set.
- */
- public String getComment()
- {
- return comment;
- }
-
- /**
- * Gets true, if the entry is a directory. This is solely
- * determined by the name, a trailing slash '/' marks a directory.
- */
- public boolean isDirectory()
- {
- int nlen = name.length();
- return nlen > 0 && name.charAt(nlen - 1) == '/';
- }
-
- /**
- * Gets the string representation of this ZipEntry. This is just
- * the name as returned by getName().
- */
- public String toString()
- {
- return name;
- }
-
- /**
- * Gets the hashCode of this ZipEntry. This is just the hashCode
- * of the name. Note that the equals method isn't changed, though.
- */
- public int hashCode()
- {
- return name.hashCode();
- }
-}
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipException.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipException.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipException.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,72 +0,0 @@
-/* ZipException.java - exception representing a zip related error
- Copyright (C) 1998, 1999, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.IOException;
-
-/**
- * Thrown during the creation or input of a zip file.
- *
- * @author Jochen Hoenicke
- * @author Per Bothner
- * @status updated to 1.4
- */
-public class ZipException extends IOException
-{
- /**
- * Compatible with JDK 1.0+.
- */
- private static final long serialVersionUID = 8000196834066748623L;
-
- /**
- * Create an exception without a message.
- */
- public ZipException()
- {
- }
-
- /**
- * Create an exception with a message.
- *
- * @param msg the message
- */
- public ZipException (String msg)
- {
- super(msg);
- }
-}
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipFile.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipFile.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipFile.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,782 +0,0 @@
-/* ZipFile.java --
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
- 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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 gnu.java.util.EmptyEnumeration;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-
-/**
- * This class represents a Zip archive. You can ask for the contained
- * entries, or get an input stream for a file entry. The entry is
- * automatically decompressed.
- *
- * This class is thread safe: You can open input streams for arbitrary
- * entries in different threads.
- *
- * @author Jochen Hoenicke
- * @author Artur Biesiadowski
- */
-public class ZipFile implements ZipConstants
-{
-
- /**
- * Mode flag to open a zip file for reading.
- */
- public static final int OPEN_READ = 0x1;
-
- /**
- * Mode flag to delete a zip file after reading.
- */
- public static final int OPEN_DELETE = 0x4;
-
- /**
- * This field isn't defined in the JDK's ZipConstants, but should be.
- */
- static final int ENDNRD = 4;
-
- // Name of this zip file.
- private final String name;
-
- // File from which zip entries are read.
- private final RandomAccessFile raf;
-
- // The entries of this zip file when initialized and not yet closed.
- private LinkedHashMap<String, ZipEntry> entries;
-
- private boolean closed = false;
-
-
- /**
- * Helper function to open RandomAccessFile and throw the proper
- * ZipException in case opening the file fails.
- *
- * @param name the file name, or null if file is provided
- *
- * @param file the file, or null if name is provided
- *
- * @return the newly open RandomAccessFile, never null
- */
- private RandomAccessFile openFile(String name,
- File file)
- throws ZipException, IOException
- {
- try
- {
- return
- (name != null)
- ? new RandomAccessFile(name, "r")
- : new RandomAccessFile(file, "r");
- }
- catch (FileNotFoundException f)
- {
- ZipException ze = new ZipException(f.getMessage());
- ze.initCause(f);
- throw ze;
- }
- }
-
-
- /**
- * Opens a Zip file with the given name for reading.
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the file doesn't contain a valid zip
- * archive.
- */
- public ZipFile(String name) throws ZipException, IOException
- {
- this.raf = openFile(name,null);
- this.name = name;
- checkZipFile();
- }
-
- /**
- * Opens a Zip file reading the given File.
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the file doesn't contain a valid zip
- * archive.
- */
- public ZipFile(File file) throws ZipException, IOException
- {
- this.raf = openFile(null,file);
- this.name = file.getPath();
- checkZipFile();
- }
-
- /**
- * Opens a Zip file reading the given File in the given mode.
- *
- * If the OPEN_DELETE mode is specified, the zip file will be deleted at
- * some time moment after it is opened. It will be deleted before the zip
- * file is closed or the Virtual Machine exits.
- *
- * The contents of the zip file will be accessible until it is closed.
- *
- * @since JDK1.3
- * @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.
- */
- public ZipFile(File file, 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 = openFile(null,file);
- this.name = file.getPath();
- checkZipFile();
- }
-
- private void checkZipFile() throws ZipException
- {
- boolean valid = false;
-
- try
- {
- byte[] buf = new byte[4];
- raf.readFully(buf);
- int sig = buf[0] & 0xFF
- | ((buf[1] & 0xFF) << 8)
- | ((buf[2] & 0xFF) << 16)
- | ((buf[3] & 0xFF) << 24);
- valid = sig == LOCSIG;
- }
- catch (IOException _)
- {
- }
-
- if (!valid)
- {
- try
- {
- raf.close();
- }
- catch (IOException _)
- {
- }
- throw new ZipException("Not a valid zip file");
- }
- }
-
- /**
- * Checks if file is closed and throws an exception.
- */
- private void checkClosed()
- {
- if (closed)
- throw new IllegalStateException("ZipFile has closed: " + name);
- }
-
- /**
- * 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 <code>raf</code>.
- *
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the central directory is malformed
- */
- private void readEntries() throws ZipException, IOException
- {
- /* Search for the End Of Central Directory. When a zip comment is
- * present the directory may start earlier.
- * Note that a comment has a maximum length of 64K, so that is the
- * maximum we search backwards.
- */
- PartialInputStream inp = new PartialInputStream(raf, 4096);
- long pos = raf.length() - ENDHDR;
- long top = Math.max(0, pos - 65536);
- do
- {
- if (pos < top)
- throw new ZipException
- ("central directory not found, probably not a zip file: " + name);
- inp.seek(pos--);
- }
- while (inp.readLeInt() != ENDSIG);
-
- if (inp.skip(ENDTOT - ENDNRD) != ENDTOT - ENDNRD)
- throw new EOFException(name);
- int count = inp.readLeShort();
- if (inp.skip(ENDOFF - ENDSIZ) != ENDOFF - ENDSIZ)
- throw new EOFException(name);
- int centralOffset = inp.readLeInt();
-
- entries = new LinkedHashMap<String, ZipEntry> (count+count/2);
- inp.seek(centralOffset);
-
- for (int i = 0; i < count; i++)
- {
- if (inp.readLeInt() != CENSIG)
- throw new ZipException("Wrong Central Directory signature: " + name);
-
- inp.skip(6);
- int method = inp.readLeShort();
- int dostime = inp.readLeInt();
- int crc = inp.readLeInt();
- int csize = inp.readLeInt();
- int size = inp.readLeInt();
- int nameLen = inp.readLeShort();
- int extraLen = inp.readLeShort();
- int commentLen = inp.readLeShort();
- inp.skip(8);
- int offset = inp.readLeInt();
- String name = inp.readString(nameLen);
-
- ZipEntry entry = new ZipEntry(name);
- entry.setMethod(method);
- entry.setCrc(crc & 0xffffffffL);
- entry.setSize(size & 0xffffffffL);
- entry.setCompressedSize(csize & 0xffffffffL);
- entry.setDOSTime(dostime);
- if (extraLen > 0)
- {
- byte[] extra = new byte[extraLen];
- inp.readFully(extra);
- entry.setExtra(extra);
- }
- if (commentLen > 0)
- {
- entry.setComment(inp.readString(commentLen));
- }
- entry.offset = offset;
- entries.put(name, entry);
- }
- }
-
- /**
- * 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.
- */
- public void close() throws IOException
- {
- RandomAccessFile raf = this.raf;
- if (raf == null)
- return;
-
- synchronized (raf)
- {
- closed = true;
- entries = null;
- raf.close();
- }
- }
-
- /**
- * Calls the <code>close()</code> method when this ZipFile has not yet
- * been explicitly closed.
- */
- protected void finalize() throws IOException
- {
- if (!closed && raf != null) close();
- }
-
- /**
- * Returns an enumeration of all Zip entries in this Zip file.
- *
- * @exception IllegalStateException when the ZipFile has already been closed
- */
- public Enumeration<? extends ZipEntry> entries()
- {
- checkClosed();
-
- try
- {
- return new ZipEntryEnumeration(getEntries().values().iterator());
- }
- catch (IOException ioe)
- {
- return EmptyEnumeration.getInstance();
- }
- }
-
- /**
- * Checks that the ZipFile is still open and reads entries when necessary.
- *
- * @exception IllegalStateException when the ZipFile has already been closed.
- * @exception IOException when the entries could not be read.
- */
- private LinkedHashMap<String, ZipEntry> getEntries() throws IOException
- {
- synchronized(raf)
- {
- checkClosed();
-
- if (entries == null)
- readEntries();
-
- return entries;
- }
- }
-
- /**
- * Searches for a zip entry in this archive with the given name.
- *
- * @param name the 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
- */
- public ZipEntry getEntry(String name)
- {
- checkClosed();
-
- try
- {
- LinkedHashMap<String, ZipEntry> entries = getEntries();
- ZipEntry entry = entries.get(name);
- // If we didn't find it, maybe it's a directory.
- if (entry == null && !name.endsWith("/"))
- entry = entries.get(name + '/');
- return entry != null ? new ZipEntry(entry, name) : null;
- }
- catch (IOException ioe)
- {
- return null;
- }
- }
-
- /**
- * Creates an input stream reading the given zip entry as
- * uncompressed data. Normally zip entry should be an entry
- * returned by getEntry() or entries().
- *
- * This implementation returns null if the requested entry does not
- * exist. This decision is not obviously correct, however, it does
- * appear to mirror Sun's implementation, and it is consistant with
- * their javadoc. On the other hand, the old JCL book, 2nd Edition,
- * claims that this should return a "non-null ZIP entry". We have
- * chosen for now ignore the old book, as modern versions of Ant (an
- * important application) depend on this behaviour. See discussion
- * in this thread:
- * http://gcc.gnu.org/ml/java-patches/2004-q2/msg00602.html
- *
- * @param entry the entry to create an InputStream for.
- * @return the input stream, or null if the requested entry does not exist.
- *
- * @exception IllegalStateException when the ZipFile has already been closed
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the Zip archive is malformed.
- */
- public InputStream getInputStream(ZipEntry entry) throws IOException
- {
- checkClosed();
-
- LinkedHashMap<String, ZipEntry> entries = getEntries();
- String name = entry.getName();
- ZipEntry zipEntry = entries.get(name);
- if (zipEntry == null)
- return null;
-
- PartialInputStream inp = new PartialInputStream(raf, 1024);
- inp.seek(zipEntry.offset);
-
- if (inp.readLeInt() != LOCSIG)
- throw new ZipException("Wrong Local header signature: " + name);
-
- inp.skip(4);
-
- if (zipEntry.getMethod() != inp.readLeShort())
- throw new ZipException("Compression method mismatch: " + name);
-
- inp.skip(16);
-
- int nameLen = inp.readLeShort();
- int extraLen = inp.readLeShort();
- inp.skip(nameLen + extraLen);
-
- inp.setLength(zipEntry.getCompressedSize());
-
- int method = zipEntry.getMethod();
- switch (method)
- {
- case ZipOutputStream.STORED:
- return inp;
- case ZipOutputStream.DEFLATED:
- inp.addDummyByte();
- final Inflater inf = new Inflater(true);
- final int sz = (int) entry.getSize();
- return new InflaterInputStream(inp, inf)
- {
- public int available() throws IOException
- {
- if (sz == -1)
- return super.available();
- if (super.available() != 0)
- return sz - inf.getTotalOut();
- return 0;
- }
- };
- default:
- throw new ZipException("Unknown compression method " + method);
- }
- }
-
- /**
- * Returns the (path) name of this zip file.
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * Returns the number of entries in this zip file.
- *
- * @exception IllegalStateException when the ZipFile has already been closed
- */
- public int size()
- {
- checkClosed();
-
- try
- {
- return getEntries().size();
- }
- catch (IOException ioe)
- {
- return 0;
- }
- }
-
- private static class ZipEntryEnumeration implements Enumeration<ZipEntry>
- {
- private final Iterator<ZipEntry> elements;
-
- public ZipEntryEnumeration(Iterator<ZipEntry> elements)
- {
- this.elements = elements;
- }
-
- public boolean hasMoreElements()
- {
- return elements.hasNext();
- }
-
- public ZipEntry nextElement()
- {
- /* We return a clone, just to be safe that the user doesn't
- * change the entry.
- */
- return (ZipEntry) (elements.next().clone());
- }
- }
-
- private static final class PartialInputStream extends InputStream
- {
- /**
- * The UTF-8 charset use for decoding the filenames.
- */
- private static final Charset UTF8CHARSET = Charset.forName("UTF-8");
-
- /**
- * The actual UTF-8 decoder. Created on demand.
- */
- private CharsetDecoder utf8Decoder;
-
- private final RandomAccessFile raf;
- private final byte[] buffer;
- private long bufferOffset;
- private int pos;
- private long end;
- // We may need to supply an extra dummy byte to our reader.
- // See Inflater. We use a count here to simplify the logic
- // elsewhere in this class. Note that we ignore the dummy
- // byte in methods where we know it is not needed.
- private int dummyByteCount;
-
- public PartialInputStream(RandomAccessFile raf, int bufferSize)
- throws IOException
- {
- this.raf = raf;
- buffer = new byte[bufferSize];
- bufferOffset = -buffer.length;
- pos = buffer.length;
- end = raf.length();
- }
-
- void setLength(long length)
- {
- end = bufferOffset + pos + length;
- }
-
- private void fillBuffer() throws IOException
- {
- synchronized (raf)
- {
- long len = end - bufferOffset;
- if (len == 0 && dummyByteCount > 0)
- {
- buffer[0] = 0;
- dummyByteCount = 0;
- }
- else
- {
- raf.seek(bufferOffset);
- raf.readFully(buffer, 0, (int) Math.min(buffer.length, len));
- }
- }
- }
-
- public int available()
- {
- long amount = end - (bufferOffset + pos);
- if (amount > Integer.MAX_VALUE)
- return Integer.MAX_VALUE;
- return (int) amount;
- }
-
- public int read() throws IOException
- {
- if (bufferOffset + pos >= end + dummyByteCount)
- return -1;
- if (pos == buffer.length)
- {
- bufferOffset += buffer.length;
- pos = 0;
- fillBuffer();
- }
-
- return buffer[pos++] & 0xFF;
- }
-
- public int read(byte[] b, int off, int len) throws IOException
- {
- if (len > end + dummyByteCount - (bufferOffset + pos))
- {
- len = (int) (end + dummyByteCount - (bufferOffset + pos));
- if (len == 0)
- return -1;
- }
-
- int totalBytesRead = Math.min(buffer.length - pos, len);
- System.arraycopy(buffer, pos, b, off, totalBytesRead);
- pos += totalBytesRead;
- off += totalBytesRead;
- len -= totalBytesRead;
-
- while (len > 0)
- {
- bufferOffset += buffer.length;
- pos = 0;
- fillBuffer();
- int remain = Math.min(buffer.length, len);
- System.arraycopy(buffer, pos, b, off, remain);
- pos += remain;
- off += remain;
- len -= remain;
- totalBytesRead += remain;
- }
-
- return totalBytesRead;
- }
-
- public long skip(long amount) throws IOException
- {
- if (amount < 0)
- return 0;
- if (amount > end - (bufferOffset + pos))
- amount = end - (bufferOffset + pos);
- seek(bufferOffset + pos + amount);
- return amount;
- }
-
- void seek(long newpos) throws IOException
- {
- long offset = newpos - bufferOffset;
- if (offset >= 0 && offset <= buffer.length)
- {
- pos = (int) offset;
- }
- else
- {
- bufferOffset = newpos;
- pos = 0;
- fillBuffer();
- }
- }
-
- void readFully(byte[] buf) throws IOException
- {
- if (read(buf, 0, buf.length) != buf.length)
- throw new EOFException();
- }
-
- void readFully(byte[] buf, int off, int len) throws IOException
- {
- if (read(buf, off, len) != len)
- throw new EOFException();
- }
-
- int readLeShort() throws IOException
- {
- int result;
- if(pos + 1 < buffer.length)
- {
- result = ((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8);
- pos += 2;
- }
- else
- {
- int b0 = read();
- int b1 = read();
- if (b1 == -1)
- throw new EOFException();
- result = (b0 & 0xff) | (b1 & 0xff) << 8;
- }
- return result;
- }
-
- int readLeInt() throws IOException
- {
- int result;
- if(pos + 3 < buffer.length)
- {
- result = (((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8)
- | ((buffer[pos + 2] & 0xff)
- | (buffer[pos + 3] & 0xff) << 8) << 16);
- pos += 4;
- }
- else
- {
- int b0 = read();
- int b1 = read();
- int b2 = read();
- int b3 = read();
- if (b3 == -1)
- throw new EOFException();
- result = (((b0 & 0xff) | (b1 & 0xff) << 8) | ((b2 & 0xff)
- | (b3 & 0xff) << 8) << 16);
- }
- return result;
- }
-
- /**
- * Decode chars from byte buffer using UTF8 encoding. This
- * operation is performance-critical since a jar file contains a
- * large number of strings for the name of each file in the
- * archive. This routine therefore avoids using the expensive
- * utf8Decoder when decoding is straightforward.
- *
- * @param buffer the buffer that contains the encoded character
- * data
- * @param pos the index in buffer of the first byte of the encoded
- * data
- * @param length the length of the encoded data in number of
- * bytes.
- *
- * @return a String that contains the decoded characters.
- */
- private String decodeChars(byte[] buffer, int pos, int length)
- throws IOException
- {
- String result;
- int i=length - 1;
- while ((i >= 0) && (buffer[i] <= 0x7f))
- {
- i--;
- }
- if (i < 0)
- {
- result = new String(buffer, 0, pos, length);
- }
- else
- {
- ByteBuffer bufferBuffer = ByteBuffer.wrap(buffer, pos, length);
- if (utf8Decoder == null)
- utf8Decoder = UTF8CHARSET.newDecoder();
- utf8Decoder.reset();
- char [] characters = utf8Decoder.decode(bufferBuffer).array();
- result = String.valueOf(characters);
- }
- return result;
- }
-
- String readString(int length) throws IOException
- {
- if (length > end - (bufferOffset + pos))
- throw new EOFException();
-
- String result = null;
- try
- {
- if (buffer.length - pos >= length)
- {
- result = decodeChars(buffer, pos, length);
- pos += length;
- }
- else
- {
- byte[] b = new byte[length];
- readFully(b);
- result = decodeChars(b, 0, length);
- }
- }
- catch (UnsupportedEncodingException uee)
- {
- throw new AssertionError(uee);
- }
- return result;
- }
-
- public void addDummyByte()
- {
- dummyByteCount = 1;
- }
- }
-}
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipInputStream.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipInputStream.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipInputStream.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,381 +0,0 @@
-/* ZipInputStream.java --
- Copyright (C) 2001, 2002, 2003, 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.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
- * one after another. It has a special method to get the zip entry of
- * the next file. The zip entry contains information about the file name
- * size, compressed size, CRC, etc.
- *
- * It includes support for STORED and DEFLATED entries.
- *
- * @author Jochen Hoenicke
- */
-public class ZipInputStream extends InflaterInputStream implements ZipConstants
-{
- private CRC32 crc = new CRC32();
- private ZipEntry entry = null;
-
- private int csize;
- private int size;
- private int method;
- private int flags;
- private int avail;
- private boolean entryAtEOF;
-
- /**
- * Creates a new Zip input stream, reading a zip archive.
- */
- public ZipInputStream(InputStream in)
- {
- super(in, new Inflater(true));
- }
-
- private void fillBuf() throws IOException
- {
- avail = len = in.read(buf, 0, buf.length);
- }
-
- private int readBuf(byte[] out, int offset, int length) throws IOException
- {
- if (avail <= 0)
- {
- fillBuf();
- if (avail <= 0)
- return -1;
- }
- if (length > avail)
- length = avail;
- System.arraycopy(buf, len - avail, out, offset, length);
- avail -= length;
- return length;
- }
-
- private void readFully(byte[] out) throws IOException
- {
- int off = 0;
- int len = out.length;
- while (len > 0)
- {
- int count = readBuf(out, off, len);
- if (count == -1)
- throw new EOFException();
- off += count;
- len -= count;
- }
- }
-
- private int readLeByte() throws IOException
- {
- if (avail <= 0)
- {
- fillBuf();
- if (avail <= 0)
- throw new ZipException("EOF in header");
- }
- return buf[len - avail--] & 0xff;
- }
-
- /**
- * Read an unsigned short in little endian byte order.
- */
- private int readLeShort() throws IOException
- {
- return readLeByte() | (readLeByte() << 8);
- }
-
- /**
- * Read an int in little endian byte order.
- */
- private int readLeInt() throws IOException
- {
- return readLeShort() | (readLeShort() << 16);
- }
-
- /**
- * Open the next entry from the zip archive, and return its description.
- * If the previous entry wasn't closed, this method will close it.
- */
- public ZipEntry getNextEntry() throws IOException
- {
- if (crc == null)
- throw new IOException("Stream closed.");
- if (entry != null)
- closeEntry();
-
- int header = readLeInt();
- if (header == CENSIG)
- {
- /* Central Header reached. */
- close();
- return null;
- }
- if (header != LOCSIG)
- throw new ZipException("Wrong Local header signature: "
- + Integer.toHexString(header));
- /* skip version */
- readLeShort();
- flags = readLeShort();
- method = readLeShort();
- int dostime = readLeInt();
- int crc = readLeInt();
- csize = readLeInt();
- size = readLeInt();
- int nameLen = readLeShort();
- int extraLen = readLeShort();
-
- if (method == ZipOutputStream.STORED && csize != size)
- throw new ZipException("Stored, but compressed != uncompressed");
-
-
- byte[] buffer = new byte[nameLen];
- readFully(buffer);
- String name;
- try
- {
- name = new String(buffer, "UTF-8");
- }
- catch (UnsupportedEncodingException uee)
- {
- throw new AssertionError(uee);
- }
-
- 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.setDOSTime(dostime);
- if (extraLen > 0)
- {
- byte[] extra = new byte[extraLen];
- readFully(extra);
- entry.setExtra(extra);
- }
-
- if (method == ZipOutputStream.DEFLATED && avail > 0)
- {
- System.arraycopy(buf, len - avail, buf, 0, avail);
- len = avail;
- avail = 0;
- inf.setInput(buf, 0, len);
- }
- return entry;
- }
-
- private void readDataDescr() throws IOException
- {
- if (readLeInt() != EXTSIG)
- throw new ZipException("Data descriptor signature not found");
- entry.setCrc(readLeInt() & 0xffffffffL);
- csize = readLeInt();
- size = readLeInt();
- entry.setSize(size & 0xffffffffL);
- entry.setCompressedSize(csize & 0xffffffffL);
- }
-
- /**
- * Closes the current zip entry and moves to the next one.
- */
- public void closeEntry() throws IOException
- {
- if (crc == null)
- throw new IOException("Stream closed.");
- if (entry == null)
- return;
-
- if (method == ZipOutputStream.DEFLATED)
- {
- if ((flags & 8) != 0)
- {
- /* We don't know how much we must skip, read until end. */
- byte[] tmp = new byte[2048];
- while (read(tmp) > 0)
- ;
-
- /* read will close this entry */
- return;
- }
- csize -= inf.getTotalIn();
- avail = inf.getRemaining();
- }
-
- if (avail > csize && csize >= 0)
- avail -= csize;
- else
- {
- csize -= avail;
- avail = 0;
- while (csize != 0)
- {
- long skipped = in.skip(csize & 0xffffffffL);
- if (skipped <= 0)
- throw new ZipException("zip archive ends early.");
- csize -= skipped;
- }
- }
-
- size = 0;
- crc.reset();
- if (method == ZipOutputStream.DEFLATED)
- inf.reset();
- entry = null;
- entryAtEOF = true;
- }
-
- public int available() throws IOException
- {
- return entryAtEOF ? 0 : 1;
- }
-
- /**
- * Reads a byte from the current zip entry.
- * @return the byte or -1 on EOF.
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the deflated stream is corrupted.
- */
- public int read() throws IOException
- {
- byte[] b = new byte[1];
- if (read(b, 0, 1) <= 0)
- return -1;
- return b[0] & 0xff;
- }
-
- /**
- * Reads a block of bytes from the current zip entry.
- * @return the number of bytes read (may be smaller, even before
- * EOF), or -1 on EOF.
- * @exception IOException if a i/o error occured.
- * @exception ZipException if the deflated stream is corrupted.
- */
- public int read(byte[] b, int off, int len) throws IOException
- {
- if (len == 0)
- return 0;
- if (crc == null)
- throw new IOException("Stream closed.");
- if (entry == null)
- return -1;
- boolean finished = false;
- switch (method)
- {
- case ZipOutputStream.DEFLATED:
- len = super.read(b, off, len);
- if (len < 0)
- {
- if (!inf.finished())
- throw new ZipException("Inflater not finished!?");
- avail = inf.getRemaining();
- if ((flags & 8) != 0)
- readDataDescr();
-
- if (inf.getTotalIn() != csize
- || inf.getTotalOut() != size)
- throw new ZipException("size mismatch: "+csize+";"+size+" <-> "+inf.getTotalIn()+";"+inf.getTotalOut());
- inf.reset();
- finished = true;
- }
- break;
-
- case ZipOutputStream.STORED:
-
- if (len > csize && csize >= 0)
- len = csize;
-
- len = readBuf(b, off, len);
- if (len > 0)
- {
- csize -= len;
- size -= len;
- }
-
- if (csize == 0)
- finished = true;
- else if (len < 0)
- throw new ZipException("EOF in stored block");
- break;
- }
-
- if (len > 0)
- crc.update(b, off, len);
-
- if (finished)
- {
- if ((crc.getValue() & 0xffffffffL) != entry.getCrc())
- throw new ZipException("CRC mismatch");
- crc.reset();
- entry = null;
- entryAtEOF = true;
- }
- return len;
- }
-
- /**
- * Closes the zip file.
- * @exception IOException if a i/o error occured.
- */
- public void close() throws IOException
- {
- super.close();
- crc = null;
- entry = null;
- entryAtEOF = true;
- }
-
- /**
- * Creates a new zip entry for the given name. This is equivalent
- * to new ZipEntry(name).
- * @param name the name of the zip entry.
- */
- protected ZipEntry createZipEntry(String name)
- {
- return new ZipEntry(name);
- }
-}
Deleted: trunk/core/src/classpath/java/java/util/zip/ZipOutputStream.java
===================================================================
--- trunk/core/src/classpath/java/java/util/zip/ZipOutputStream.java 2009-03-25 04:59:56 UTC (rev 5151)
+++ trunk/core/src/classpath/java/java/util/zip/ZipOutputStream.java 2009-03-25 11:00:27 UTC (rev 5152)
@@ -1,440 +0,0 @@
-/* ZipOutputStream.java --
- Copyright (C) 2001, 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * This is a FilterOutputStream that writes the files into a zip
- * archive one after another. It has a special method to start a new
- * zip entry. The zip entries contains information about the file name
- * size, compressed size, CRC, etc.
- *
- * It includes support for STORED and DEFLATED entries.
- *
- * This class is not thread safe.
- *
- * @author Jochen Hoenicke
- */
-public class ZipOutputStream extends DeflaterOutputStream implements ZipConstants
-{
- private Vector entries = new Vector();
- private CRC32 crc = new CRC32();
- private ZipEntry curEntry = null;
-
- private int curMethod;
- private int size;
- private int offset = 0;
-
- private byte[] zipComment = new byte[0];
- private int defaultMethod = DEFLATED;
-
- /**
- * Our Zip version is hard coded to 1.0 resp. 2.0
- */
- private static final int ZIP_STORED_VERSION = 10;
- private static final int ZIP_DEFLATED_VERSION = 20;
-
- /**
- * Compression method. This method doesn't compress at all.
- */
- public static final int STORED = 0;
-
- /**
- * Compression method. This method uses the Deflater.
- */
- public static final int DEFLATED = 8;
-
- /**
- * Creates a new Zip output stream, writing a zip archive.
- * @param out the output stream to which the zip archive is written.
- */
- public ZipOutputStream(OutputStream out)
- {
- super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true));
- }
-
- /**
- * Set the zip file comment.
- * @param comment the comment.
- * @exception IllegalArgumentException if encoding of comment is
- * longer than 0xffff bytes.
- */
- public void setComment(String comment)
- {
- byte[] commentBytes;
- try
- {
- commentBytes = comment.getBytes("UTF-8");
- }
- catch (UnsupportedEncodingException uee)
- {
- throw new AssertionError(uee);
- }
- if (commentBytes.length > 0xffff)
- throw new IllegalArgumentException("Comment too long.");
- zipComment = commentBytes;
- }
-
- /**
- * Sets default compression method. If the Zip entry specifies
- * another method its method takes precedence.
- * @param method the method.
- * @exception IllegalArgumentException if method is not supported.
- * @see #STORED
- * @see #DEFLATED
- */
- public void setMethod(int method)
- {
- if (method != STORED && method != DEFLATED)
- throw new IllegalArgumentException("Method not supported.");
- defaultMethod = method;
- }
-
- /**
- * Sets default compression level. The new level will be activated
- * immediately.
- * @exception IllegalArgumentException if level is not supported.
- * @see Deflater
- */
- public void setLevel(int level)
- {
- def.setLevel(level);
- }
-
- /**
- * Write an unsigned short in little endian byte order.
- */
- private void writeLeShort(int value) throws IOException
- {
- out.write(value & 0xff);
- out.write((value >> 8) & 0xff);
- }
-
- /**
- * Write an int in little endian byte order.
- */
- private void writeLeInt(int value) throws IOException
- {
- writeLeShort(value);
- writeLeShort(value >> 16);
- }
-
- /**
- * Write a long value as an int. Some of the zip constants
- * are declared as longs even though they fit perfectly well
- * into integers.
- */
- private void writeLeInt(long value) throws IOException
- {
- writeLeInt((int) value);
- }
-
- /**
- * Starts a new Zip entry. It automatically closes the previous
- * entry if present. If the compression method is stored, the entry
- * must have a valid size and crc, otherwise all elements (except
- * name) are optional, but must be correct if present. If the time
- * is not set in the entry, the current time is used.
- * @param entry the entry.
- * @exception IOException if an I/O error occured.
- * @exception ZipException if stream was finished.
- */
- public void putNextEntry(ZipEntry entry) throws IOException
- {
- if (entries == null)
- throw new ZipException("ZipOutputStream was finished");
-
- int method = entry.getMethod();
- int flags = 0;
- i...
[truncated message content] |
