After merge cleanup of java.util.zip

[Mark Wielaard]

Hi,

After hunting down and applying all of the following patches

2005-11-15  Anthony Green  <green@redhat.com>

    * java/util/zip/ZipFile.java (checkZipFile): Make sure we read all
    4 bytes of the magic number.

2005-11-15  Michael Koch  <konqueror@gmx.de>

    * java/util/zip/ZipFile.java
    (ZIP_MAGIC): New constant.
    (ZipFile): Check if given file is really a zip file.
    (checkZipFile): New method.
    (checkClosed): New method.
    (entries): Check if file was closed. Return an empty enumeration in
    error case.
    (getEntries): Use checkClosed().
    (getEntry): Check if file was closed.
    (getInputStream): Likewise.
    (size): Likewise.

2005-11-15  Mark Wielaard  <mark@klomp.org>
            Christian Schlichtherle  <christian@schlichtherle.de>

    * java/util/zip/ZipEntry.java (setTime): Use
    Calendar.setTimeInMillis().
    (getTime): First parse extra bytes. Use Calendar.getTimeInMillis().
    (parseExtra): Don't return early to make sure that KNOWN_EXTRA is
    always set.
    * java/util/zip/ZipFile.java (readEntries): Parse name and comment
    as UTF-8 string.
    (close): Check that raf is not null.

2004-11-15  Jeroen Frijters  <jeroen@frijters.net>

    * java/util/zip/ZipFile.java
    (getEntry): Fix to find dir entries without slash.
    * java/util/zip/ZipEntry.java
    (ZipEntry(ZipEntry,String)): New constructor to copy and change name.
    (ZipEntry(ZipEntry)): Delegate to new constructor.

2005-11-15  Mark Wielaard  <mark@klomp.org>

    * java/util/zip/ZipEntry.java (KNOWN_EXTRA): New static field.
    (setExtra): Don't parse bytes.
    (parseExtra): New private method.
    (getTime): Call parseExtra.

ZipFile and ZipEntry were completely identical to their upstream
versions. So we don't need to diverge any longer:

2005-11-15  Mark Wielaard  <mark@klomp.org>

        * java/util/zip/ZipEntry.java: Removed, fully merged now.
        * java/util/zip/ZipFile.java: Likewise.
        * sources.am: Regenerated.
        * Makefile.in: Regenerated.

This fixes a couple of zip mauve tests.

Committed,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: zip-merge.patch
Type: text/x-patch
Size: 29345 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20051116/4ff998e2/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20051116/4ff998e2/attachment.sig>