src/java.base/share/classes/java/util/zip/ZipFile.java
author lancea
Wed, 30 Oct 2019 15:54:41 -0400
changeset 58864 fba8635290df
parent 57670 cffcc4c5a5ba
child 59201 b24f4caa1411
permissions -rw-r--r--
8231451: ZipFileInputStream::skip handling of negative values with STORED entries Reviewed-by: clanger, bpb, alanb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
57670
cffcc4c5a5ba 8226530: ZipFile reads wrong entry size from ZIP64 entries
lancea
parents: 52427
diff changeset
     2
 * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5148
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5148
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5148
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5148
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5148
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
package java.util.zip;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
    28
import java.io.Closeable;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
import java.io.InputStream;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
import java.io.IOException;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
import java.io.EOFException;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
import java.io.File;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    33
import java.io.RandomAccessFile;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    34
import java.io.UncheckedIOException;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    35
import java.lang.ref.Cleaner.Cleanable;
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
    36
import java.nio.charset.Charset;
9676
5663e62f8d7e 7041612: Rename StandardCharset to StandardCharsets
mduigou
parents: 9526
diff changeset
    37
import java.nio.charset.StandardCharsets;
52034
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
    38
import java.nio.file.InvalidPathException;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    39
import java.nio.file.attribute.BasicFileAttributes;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    40
import java.nio.file.Files;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
    41
import java.util.ArrayDeque;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    42
import java.util.ArrayList;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    43
import java.util.Arrays;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    44
import java.util.Collections;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
    45
import java.util.Deque;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
import java.util.Enumeration;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
    47
import java.util.HashMap;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    48
import java.util.Iterator;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    49
import java.util.Objects;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
import java.util.NoSuchElementException;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    51
import java.util.Set;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    52
import java.util.Spliterator;
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    53
import java.util.Spliterators;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
    54
import java.util.WeakHashMap;
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
    55
import java.util.function.Consumer;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
    56
import java.util.function.Function;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
    57
import java.util.function.IntFunction;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
    58
import java.util.jar.JarEntry;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    59
import java.util.stream.Stream;
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    60
import java.util.stream.StreamSupport;
52427
3c6aa484536c 8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents: 52305
diff changeset
    61
import jdk.internal.access.JavaLangAccess;
3c6aa484536c 8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents: 52305
diff changeset
    62
import jdk.internal.access.JavaUtilZipFileAccess;
3c6aa484536c 8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents: 52305
diff changeset
    63
import jdk.internal.access.SharedSecrets;
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
    64
import jdk.internal.misc.VM;
34953
67245e3259bf 8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents: 34874
diff changeset
    65
import jdk.internal.perf.PerfCounter;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    66
import jdk.internal.ref.CleanerFactory;
49442
d6d1c06becda 8200124: Various cleanups in jar/zip
martin
parents: 48337
diff changeset
    67
import jdk.internal.vm.annotation.Stable;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
    68
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
    69
import static java.util.zip.ZipConstants64.*;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    70
import static java.util.zip.ZipUtils.*;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
/**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
 * This class is used to read entries from a zip file.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
 *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
    75
 * <p> Unless otherwise noted, passing a {@code null} argument to a constructor
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
 * or method in this class will cause a {@link NullPointerException} to be
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
 * thrown.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
 *
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    79
 * @apiNote
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    80
 * To release resources used by this {@code ZipFile}, the {@link #close()} method
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    81
 * should be called explicitly or by try-with-resources. Subclasses are responsible
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    82
 * for the cleanup of resources acquired by the subclass. Subclasses that override
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    83
 * {@link #finalize()} in order to perform cleanup should be modified to use alternative
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    84
 * cleanup mechanisms such as {@link java.lang.ref.Cleaner} and remove the overriding
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    85
 * {@code finalize} method.
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    86
 *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
 * @author      David Connelly
45434
4582657c7260 8181082: class-level since tag issues in java.base & java.datatransfer module
mli
parents: 44534
diff changeset
    88
 * @since 1.1
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    90
public
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
    91
class ZipFile implements ZipConstants, Closeable {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
    92
18223
35a5c2462991 8008593: Better URLClassLoader resource management
chegar
parents: 9676
diff changeset
    93
    private final String name;     // zip file name
34774
03b4e6dc367b 8145680: Remove unnecessary explicit initialization of volatile variables in java.base
redestad
parents: 34693
diff changeset
    94
    private volatile boolean closeRequested;
49442
d6d1c06becda 8200124: Various cleanups in jar/zip
martin
parents: 48337
diff changeset
    95
    private final @Stable ZipCoder zc;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    97
    // The "resource" used by this zip file that needs to be
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    98
    // cleaned after use.
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
    99
    // a) the input streams that need to be closed
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   100
    // b) the list of cached Inflater objects
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   101
    // c) the "native" source of this zip file.
49442
d6d1c06becda 8200124: Various cleanups in jar/zip
martin
parents: 48337
diff changeset
   102
    private final @Stable CleanableResource res;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   103
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
    private static final int STORED = ZipEntry.STORED;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
    private static final int DEFLATED = ZipEntry.DEFLATED;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
     * Mode flag to open a zip file for reading.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
    public static final int OPEN_READ = 0x1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
     * Mode flag to open a zip file and mark it for deletion.  The file will be
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
     * deleted some time between the moment that it is opened and the moment
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
     * that it is closed, but its contents will remain accessible via the
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   116
     * {@code ZipFile} object until either the close method is invoked or the
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
     * virtual machine exits.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
    public static final int OPEN_DELETE = 0x4;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
     * Opens a zip file for reading.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
     *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   124
     * <p>First, if there is a security manager, its {@code checkRead}
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   125
     * method is called with the {@code name} argument as its argument
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   126
     * to ensure the read is allowed.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   127
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   128
     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   129
     * decode the entry names and comments.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
     * @param name the name of the zip file
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
     * @throws ZipException if a ZIP format error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
     * @throws IOException if an I/O error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
     * @throws SecurityException if a security manager exists and its
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   135
     *         {@code checkRead} method doesn't allow read access to the file.
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   136
     *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
     * @see SecurityManager#checkRead(java.lang.String)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
    public ZipFile(String name) throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
        this(new File(name), OPEN_READ);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
    /**
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   144
     * Opens a new {@code ZipFile} to read from the specified
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   145
     * {@code File} object in the specified mode.  The mode argument
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   146
     * must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
     *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   148
     * <p>First, if there is a security manager, its {@code checkRead}
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   149
     * method is called with the {@code name} argument as its argument to
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
     * ensure the read is allowed.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
     *
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   152
     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   153
     * decode the entry names and comments
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   154
     *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
     * @param file the ZIP file to be opened for reading
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
     * @param mode the mode in which the file is to be opened
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
     * @throws ZipException if a ZIP format error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
     * @throws IOException if an I/O error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
     * @throws SecurityException if a security manager exists and
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   160
     *         its {@code checkRead} method
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
     *         doesn't allow read access to the file,
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   162
     *         or its {@code checkDelete} method doesn't allow deleting
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   163
     *         the file when the {@code OPEN_DELETE} flag is set.
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   164
     * @throws IllegalArgumentException if the {@code mode} argument is invalid
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
     * @see SecurityManager#checkRead(java.lang.String)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
     * @since 1.3
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
    public ZipFile(File file, int mode) throws IOException {
9676
5663e62f8d7e 7041612: Rename StandardCharset to StandardCharsets
mduigou
parents: 9526
diff changeset
   169
        this(file, mode, StandardCharsets.UTF_8);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   170
    }
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   171
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   172
    /**
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   173
     * Opens a ZIP file for reading given the specified File object.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   174
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   175
     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   176
     * decode the entry names and comments.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   177
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   178
     * @param file the ZIP file to be opened for reading
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   179
     * @throws ZipException if a ZIP format error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   180
     * @throws IOException if an I/O error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   181
     */
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   182
    public ZipFile(File file) throws ZipException, IOException {
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   183
        this(file, OPEN_READ);
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   184
    }
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   185
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   186
    /**
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   187
     * Opens a new {@code ZipFile} to read from the specified
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   188
     * {@code File} object in the specified mode.  The mode argument
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   189
     * must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}.
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   190
     *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   191
     * <p>First, if there is a security manager, its {@code checkRead}
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   192
     * method is called with the {@code name} argument as its argument to
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   193
     * ensure the read is allowed.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   194
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   195
     * @param file the ZIP file to be opened for reading
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   196
     * @param mode the mode in which the file is to be opened
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   197
     * @param charset
2704
a92617170304 6836489: Incorrect @link usage in java.util.zip API doc
sherman
parents: 2592
diff changeset
   198
     *        the {@linkplain java.nio.charset.Charset charset} to
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   199
     *        be used to decode the ZIP entry name and comment that are not
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   200
     *        encoded by using UTF-8 encoding (indicated by entry's general
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   201
     *        purpose flag).
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   202
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   203
     * @throws ZipException if a ZIP format error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   204
     * @throws IOException if an I/O error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   205
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   206
     * @throws SecurityException
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   207
     *         if a security manager exists and its {@code checkRead}
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   208
     *         method doesn't allow read access to the file,or its
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   209
     *         {@code checkDelete} method doesn't allow deleting the
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   210
     *         file when the {@code OPEN_DELETE} flag is set
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   211
     *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   212
     * @throws IllegalArgumentException if the {@code mode} argument is invalid
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   213
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   214
     * @see SecurityManager#checkRead(java.lang.String)
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   215
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   216
     * @since 1.7
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   217
     */
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   218
    public ZipFile(File file, int mode, Charset charset) throws IOException
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   219
    {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
        if (((mode & OPEN_READ) == 0) ||
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
            ((mode & ~(OPEN_READ | OPEN_DELETE)) != 0)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
            throw new IllegalArgumentException("Illegal mode: 0x"+
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
                                               Integer.toHexString(mode));
90ce3da70b43 Initial load
duke
parents:
diff changeset
   224
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   225
        String name = file.getPath();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   226
        SecurityManager sm = System.getSecurityManager();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   227
        if (sm != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   228
            sm.checkRead(name);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   229
            if ((mode & OPEN_DELETE) != 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   230
                sm.checkDelete(name);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
        }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   233
        Objects.requireNonNull(charset, "charset");
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   234
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   235
        this.zc = ZipCoder.get(charset);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   236
        this.name = name;
3849
34469964aa98 6878481: Add performance counters in the JDK
mchung
parents: 3078
diff changeset
   237
        long t0 = System.nanoTime();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   238
52305
52a97e06a5e3 8212129: Remove finalize methods from java.util.zip.ZipFIle/Inflator/Deflator
lancea
parents: 52034
diff changeset
   239
        this.res = new CleanableResource(this, file, mode);
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   240
34953
67245e3259bf 8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents: 34874
diff changeset
   241
        PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
67245e3259bf 8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents: 34874
diff changeset
   242
        PerfCounter.getZipFileCount().increment();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   243
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   244
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   245
    /**
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   246
     * Opens a zip file for reading.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   247
     *
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   248
     * <p>First, if there is a security manager, its {@code checkRead}
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   249
     * method is called with the {@code name} argument as its argument
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   250
     * to ensure the read is allowed.
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   251
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   252
     * @param name the name of the zip file
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   253
     * @param charset
2704
a92617170304 6836489: Incorrect @link usage in java.util.zip API doc
sherman
parents: 2592
diff changeset
   254
     *        the {@linkplain java.nio.charset.Charset charset} to
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   255
     *        be used to decode the ZIP entry name and comment that are not
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   256
     *        encoded by using UTF-8 encoding (indicated by entry's general
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   257
     *        purpose flag).
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   258
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   259
     * @throws ZipException if a ZIP format error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   260
     * @throws IOException if an I/O error has occurred
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   261
     * @throws SecurityException
32037
ab4526f4ac10 8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents: 31469
diff changeset
   262
     *         if a security manager exists and its {@code checkRead}
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   263
     *         method doesn't allow read access to the file
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   264
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   265
     * @see SecurityManager#checkRead(java.lang.String)
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   266
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   267
     * @since 1.7
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   268
     */
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   269
    public ZipFile(String name, Charset charset) throws IOException
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   270
    {
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   271
        this(new File(name), OPEN_READ, charset);
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   272
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   273
90ce3da70b43 Initial load
duke
parents:
diff changeset
   274
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   275
     * Opens a ZIP file for reading given the specified File object.
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   276
     *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   277
     * @param file the ZIP file to be opened for reading
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   278
     * @param charset
2704
a92617170304 6836489: Incorrect @link usage in java.util.zip API doc
sherman
parents: 2592
diff changeset
   279
     *        The {@linkplain java.nio.charset.Charset charset} to be
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   280
     *        used to decode the ZIP entry name and comment (ignored if
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   281
     *        the <a href="package-summary.html#lang_encoding"> language
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   282
     *        encoding bit</a> of the ZIP entry's general purpose bit
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   283
     *        flag is set).
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   284
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   285
     * @throws ZipException if a ZIP format error has occurred
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   286
     * @throws IOException if an I/O error has occurred
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   287
     *
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   288
     * @since 1.7
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   289
     */
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   290
    public ZipFile(File file, Charset charset) throws IOException
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   291
    {
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   292
        this(file, OPEN_READ, charset);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   293
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   294
90ce3da70b43 Initial load
duke
parents:
diff changeset
   295
    /**
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   296
     * Returns the zip file comment, or null if none.
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   297
     *
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   298
     * @return the comment string for the zip file, or null if none
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   299
     *
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   300
     * @throws IllegalStateException if the zip file has been closed
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   301
     *
43794
497288c158bf 8173094: Error in API documentation for SwingWorker
coffeys
parents: 42444
diff changeset
   302
     * @since 1.7
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   303
     */
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   304
    public String getComment() {
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   305
        synchronized (this) {
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   306
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   307
            if (res.zsrc.comment == null) {
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   308
                return null;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   309
            }
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   310
            return zc.toString(res.zsrc.comment);
3078
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   311
        }
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   312
    }
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   313
c491f0d2a8aa 6707281: Adler32.update() JavaDoc is wrong
sherman
parents: 2915
diff changeset
   314
    /**
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   315
     * Returns the zip file entry for the specified name, or null
90ce3da70b43 Initial load
duke
parents:
diff changeset
   316
     * if not found.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   317
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   318
     * @param name the name of the entry
90ce3da70b43 Initial load
duke
parents:
diff changeset
   319
     * @return the zip file entry, or null if not found
90ce3da70b43 Initial load
duke
parents:
diff changeset
   320
     * @throws IllegalStateException if the zip file has been closed
90ce3da70b43 Initial load
duke
parents:
diff changeset
   321
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   322
    public ZipEntry getEntry(String name) {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   323
        return getEntry(name, ZipEntry::new);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   324
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   325
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   326
    /*
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   327
     * Returns the zip file entry for the specified name, or null
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   328
     * if not found.
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   329
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   330
     * @param name the name of the entry
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   331
     * @param func the function that creates the returned entry
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   332
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   333
     * @return the zip file entry, or null if not found
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   334
     * @throws IllegalStateException if the zip file has been closed
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   335
     */
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   336
    private ZipEntry getEntry(String name, Function<String, ? extends ZipEntry> func) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   337
        Objects.requireNonNull(name, "name");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   338
        synchronized (this) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   339
            ensureOpen();
39310
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   340
            byte[] bname = zc.getBytes(name);
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   341
            int pos = res.zsrc.getEntryPos(bname, true);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   342
            if (pos != -1) {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   343
                return getZipEntry(name, bname, pos, func);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   345
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
        return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   348
90ce3da70b43 Initial load
duke
parents:
diff changeset
   349
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   350
     * Returns an input stream for reading the contents of the specified
90ce3da70b43 Initial load
duke
parents:
diff changeset
   351
     * zip file entry.
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   352
     * <p>
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   353
     * Closing this ZIP file will, in turn, close all input streams that
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   354
     * have been returned by invocations of this method.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   355
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   356
     * @param entry the zip file entry
90ce3da70b43 Initial load
duke
parents:
diff changeset
   357
     * @return the input stream for reading the contents of the specified
90ce3da70b43 Initial load
duke
parents:
diff changeset
   358
     * zip file entry.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   359
     * @throws ZipException if a ZIP format error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   360
     * @throws IOException if an I/O error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   361
     * @throws IllegalStateException if the zip file has been closed
90ce3da70b43 Initial load
duke
parents:
diff changeset
   362
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   363
    public InputStream getInputStream(ZipEntry entry) throws IOException {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   364
        Objects.requireNonNull(entry, "entry");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   365
        int pos = -1;
49442
d6d1c06becda 8200124: Various cleanups in jar/zip
martin
parents: 48337
diff changeset
   366
        ZipFileInputStream in;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   367
        Source zsrc = res.zsrc;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   368
        Set<InputStream> istreams = res.istreams;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   369
        synchronized (this) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   370
            ensureOpen();
42444
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   371
            if (Objects.equals(lastEntryName, entry.name)) {
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   372
                pos = lastEntryPos;
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   373
            } else if (!zc.isUTF8() && (entry.flag & USE_UTF8) != 0) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   374
                pos = zsrc.getEntryPos(zc.getBytesUTF8(entry.name), false);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   375
            } else {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   376
                pos = zsrc.getEntryPos(zc.getBytes(entry.name), false);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   377
            }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   378
            if (pos == -1) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   379
                return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   380
            }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   381
            in = new ZipFileInputStream(zsrc.cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   382
            switch (CENHOW(zsrc.cen, pos)) {
7550
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   383
            case STORED:
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   384
                synchronized (istreams) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   385
                    istreams.add(in);
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   386
                }
7550
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   387
                return in;
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   388
            case DEFLATED:
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   389
                // Inflater likes a bit of slack
7550
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   390
                // MORE: Compute good size for inflater stream:
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   391
                long size = CENLEN(zsrc.cen, pos) + 2;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   392
                if (size > 65536) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   393
                    size = 8192;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   394
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   395
                if (size <= 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   396
                    size = 4096;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   397
                }
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   398
                InputStream is = new ZipFileInflaterInputStream(in, res, (int)size);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   399
                synchronized (istreams) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   400
                    istreams.add(is);
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   401
                }
7550
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   402
                return is;
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   403
            default:
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   404
                throw new ZipException("invalid compression method");
700dd1df3aa8 7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents: 6882
diff changeset
   405
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   406
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   407
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   408
48337
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   409
    private static class InflaterCleanupAction implements Runnable {
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   410
        private final Inflater inf;
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   411
        private final CleanableResource res;
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   412
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   413
        InflaterCleanupAction(Inflater inf, CleanableResource res) {
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   414
            this.inf = inf;
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   415
            this.res = res;
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   416
        }
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   417
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   418
        @Override
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   419
        public void run() {
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   420
            res.releaseInflater(inf);
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   421
        }
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   422
    }
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   423
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   424
    private class ZipFileInflaterInputStream extends InflaterInputStream {
34774
03b4e6dc367b 8145680: Remove unnecessary explicit initialization of volatile variables in java.base
redestad
parents: 34693
diff changeset
   425
        private volatile boolean closeRequested;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   426
        private boolean eof = false;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   427
        private final Cleanable cleanable;
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   428
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   429
        ZipFileInflaterInputStream(ZipFileInputStream zfin,
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   430
                                   CleanableResource res, int size) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   431
            this(zfin, res, res.getInflater(), size);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   432
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   433
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   434
        private ZipFileInflaterInputStream(ZipFileInputStream zfin,
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   435
                                           CleanableResource res,
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   436
                                           Inflater inf, int size) {
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   437
            super(zfin, inf, size);
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   438
            this.cleanable = CleanerFactory.cleaner().register(this,
48337
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   439
                    new InflaterCleanupAction(inf, res));
0ee20aad71c4 8193507: [REDO] Startup regression due to JDK-8185582
redestad
parents: 48330
diff changeset
   440
        }
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   441
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   442
        public void close() throws IOException {
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   443
            if (closeRequested)
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   444
                return;
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   445
            closeRequested = true;
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   446
            super.close();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   447
            synchronized (res.istreams) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   448
                res.istreams.remove(this);
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   449
            }
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   450
            cleanable.clean();
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   451
        }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   452
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   453
        // Override fill() method to provide an extra "dummy" byte
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   454
        // at the end of the input stream. This is required when
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   455
        // using the "nowrap" Inflater option.
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   456
        protected void fill() throws IOException {
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   457
            if (eof) {
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   458
                throw new EOFException("Unexpected end of ZLIB input stream");
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   459
            }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   460
            len = in.read(buf, 0, buf.length);
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   461
            if (len == -1) {
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   462
                buf[0] = 0;
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   463
                len = 1;
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   464
                eof = true;
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   465
            }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   466
            inf.setInput(buf, 0, len);
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   467
        }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   468
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   469
        public int available() throws IOException {
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   470
            if (closeRequested)
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   471
                return 0;
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   472
            long avail = ((ZipFileInputStream)in).size() - inf.getBytesWritten();
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   473
            return (avail > (long) Integer.MAX_VALUE ?
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   474
                    Integer.MAX_VALUE : (int) avail);
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   475
        }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   476
    }
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   477
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   478
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   479
     * Returns the path name of the ZIP file.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   480
     * @return the path name of the ZIP file
90ce3da70b43 Initial load
duke
parents:
diff changeset
   481
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   482
    public String getName() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   483
        return name;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   484
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   486
    private class ZipEntryIterator<T extends ZipEntry>
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   487
            implements Enumeration<T>, Iterator<T> {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   488
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   489
        private int i = 0;
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   490
        private final int entryCount;
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   491
        private final Function<String, T> gen;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   492
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   493
        public ZipEntryIterator(int entryCount, Function<String, T> gen) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   494
            this.entryCount = entryCount;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   495
            this.gen = gen;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   496
        }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   497
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   498
        @Override
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   499
        public boolean hasMoreElements() {
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   500
            return hasNext();
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   501
        }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   502
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   503
        @Override
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   504
        public boolean hasNext() {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   505
            return i < entryCount;
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   506
        }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   507
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   508
        @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   509
        public T nextElement() {
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   510
            return next();
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   511
        }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   512
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   513
        @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   514
        @SuppressWarnings("unchecked")
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   515
        public T next() {
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   516
            synchronized (ZipFile.this) {
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   517
                ensureOpen();
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   518
                if (!hasNext()) {
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   519
                    throw new NoSuchElementException();
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   520
                }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   521
                // each "entry" has 3 ints in table entries
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   522
                return (T)getZipEntry(null, null, res.zsrc.getEntryPos(i++ * 3), gen);
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   523
            }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   524
        }
31469
92cc72d2a11a 8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents: 30786
diff changeset
   525
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   526
        @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   527
        public Iterator<T> asIterator() {
31469
92cc72d2a11a 8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents: 30786
diff changeset
   528
            return this;
92cc72d2a11a 8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents: 30786
diff changeset
   529
        }
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   530
    }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   531
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   532
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   533
     * Returns an enumeration of the ZIP file entries.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   534
     * @return an enumeration of the ZIP file entries
90ce3da70b43 Initial load
duke
parents:
diff changeset
   535
     * @throws IllegalStateException if the zip file has been closed
90ce3da70b43 Initial load
duke
parents:
diff changeset
   536
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   537
    public Enumeration<? extends ZipEntry> entries() {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   538
        synchronized (this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   539
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   540
            return new ZipEntryIterator<ZipEntry>(res.zsrc.total, ZipEntry::new);
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   541
        }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   542
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   543
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   544
    private Enumeration<JarEntry> entries(Function<String, JarEntry> func) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   545
        synchronized (this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   546
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   547
            return new ZipEntryIterator<JarEntry>(res.zsrc.total, func);
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   548
        }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   549
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   550
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   551
    private class EntrySpliterator<T> extends Spliterators.AbstractSpliterator<T> {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   552
        private int index;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   553
        private final int fence;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   554
        private final IntFunction<T> gen;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   555
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   556
        EntrySpliterator(int index, int fence, IntFunction<T> gen) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   557
            super((long)fence,
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   558
                  Spliterator.ORDERED | Spliterator.DISTINCT | Spliterator.IMMUTABLE |
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   559
                  Spliterator.NONNULL);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   560
            this.index = index;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   561
            this.fence = fence;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   562
            this.gen = gen;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   563
        }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   564
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   565
        @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   566
        public boolean tryAdvance(Consumer<? super T> action) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   567
            if (action == null)
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   568
                throw new NullPointerException();
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   569
            if (index >= 0 && index < fence) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   570
                synchronized (ZipFile.this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   571
                    ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   572
                    action.accept(gen.apply(res.zsrc.getEntryPos(index++ * 3)));
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   573
                }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   574
                return true;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   575
            }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   576
            return false;
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   577
        }
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   578
    }
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   579
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   580
    /**
30786
fb0d6aaea1dc 8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents: 29226
diff changeset
   581
     * Returns an ordered {@code Stream} over the ZIP file entries.
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   582
     *
17421
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   583
     * Entries appear in the {@code Stream} in the order they appear in
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   584
     * the central directory of the ZIP file.
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   585
     *
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   586
     * @return an ordered {@code Stream} of entries in this ZIP file
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   587
     * @throws IllegalStateException if the zip file has been closed
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   588
     * @since 1.8
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   589
     */
f3fbcfe6e2cf 8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents: 9676
diff changeset
   590
    public Stream<? extends ZipEntry> stream() {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   591
        synchronized (this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   592
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   593
            return StreamSupport.stream(new EntrySpliterator<>(0, res.zsrc.total,
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   594
                pos -> getZipEntry(null, null, pos, ZipEntry::new)), false);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   595
       }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   596
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   597
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   598
    private String getEntryName(int pos) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   599
        byte[] cen = res.zsrc.cen;
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   600
        int nlen = CENNAM(cen, pos);
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   601
        if (!zc.isUTF8() && (CENFLG(cen, pos) & USE_UTF8) != 0) {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   602
            return zc.toStringUTF8(cen, pos + CENHDR, nlen);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   603
        } else {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   604
            return zc.toString(cen, pos + CENHDR, nlen);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   605
        }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   606
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   607
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   608
    /*
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   609
     * Returns an ordered {@code Stream} over the zip file entry names.
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   610
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   611
     * Entry names appear in the {@code Stream} in the order they appear in
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   612
     * the central directory of the ZIP file.
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   613
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   614
     * @return an ordered {@code Stream} of entry names in this zip file
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   615
     * @throws IllegalStateException if the zip file has been closed
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   616
     * @since 10
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   617
     */
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   618
    private Stream<String> entryNameStream() {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   619
        synchronized (this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   620
            ensureOpen();
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   621
            return StreamSupport.stream(
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   622
                new EntrySpliterator<>(0, res.zsrc.total, this::getEntryName), false);
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   623
        }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   624
    }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   625
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   626
    /*
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   627
     * Returns an ordered {@code Stream} over the zip file entries.
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   628
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   629
     * Entries appear in the {@code Stream} in the order they appear in
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   630
     * the central directory of the jar file.
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   631
     *
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   632
     * @param func the function that creates the returned entry
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   633
     * @return an ordered {@code Stream} of entries in this zip file
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   634
     * @throws IllegalStateException if the zip file has been closed
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   635
     * @since 10
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   636
     */
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   637
    private Stream<JarEntry> stream(Function<String, JarEntry> func) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   638
        synchronized (this) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   639
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   640
            return StreamSupport.stream(new EntrySpliterator<>(0, res.zsrc.total,
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   641
                pos -> (JarEntry)getZipEntry(null, null, pos, func)), false);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   642
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   643
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   644
42444
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   645
    private String lastEntryName;
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   646
    private int lastEntryPos;
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   647
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   648
    /* Checks ensureOpen() before invoke this method */
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   649
    private ZipEntry getZipEntry(String name, byte[] bname, int pos,
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   650
                                 Function<String, ? extends ZipEntry> func) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   651
        byte[] cen = res.zsrc.cen;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   652
        int nlen = CENNAM(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   653
        int elen = CENEXT(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   654
        int clen = CENCOM(cen, pos);
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   655
        int flag = CENFLG(cen, pos);
39310
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   656
        if (name == null || bname.length != nlen) {
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   657
            // to use the entry name stored in cen, if the passed in name is
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   658
            // (1) null, invoked from iterator, or
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   659
            // (2) not equal to the name stored, a slash is appended during
fed59f4021c8 6233323: ZipEntry.isDirectory() may return false incorrectly
sherman
parents: 38467
diff changeset
   660
            // getEntryPos() search.
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   661
            if (!zc.isUTF8() && (flag & USE_UTF8) != 0) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   662
                name = zc.toStringUTF8(cen, pos + CENHDR, nlen);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   663
            } else {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   664
                name = zc.toString(cen, pos + CENHDR, nlen);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   665
            }
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   666
        }
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
   667
        ZipEntry e = func.apply(name);    //ZipEntry e = new ZipEntry(name);
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   668
        e.flag = flag;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   669
        e.xdostime = CENTIM(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   670
        e.crc = CENCRC(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   671
        e.size = CENLEN(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   672
        e.csize = CENSIZ(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   673
        e.method = CENHOW(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   674
        if (elen != 0) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   675
            int start = pos + CENHDR + nlen;
57670
cffcc4c5a5ba 8226530: ZipFile reads wrong entry size from ZIP64 entries
lancea
parents: 52427
diff changeset
   676
            e.setExtra0(Arrays.copyOfRange(cen, start, start + elen), true, false);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   677
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   678
        if (clen != 0) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   679
            int start = pos + CENHDR + nlen + elen;
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   680
            if (!zc.isUTF8() && (flag & USE_UTF8) != 0) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   681
                e.comment = zc.toStringUTF8(cen, start, clen);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   682
            } else {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
   683
                e.comment = zc.toString(cen, start, clen);
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   684
            }
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   685
        }
42444
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   686
        lastEntryName = e.name;
628321b5a236 8170831: ZipFile implementation no longer caches the last accessed entry/pos
sherman
parents: 39310
diff changeset
   687
        lastEntryPos = pos;
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   688
        return e;
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   689
    }
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
   690
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   691
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   692
     * Returns the number of entries in the ZIP file.
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   693
     *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   694
     * @return the number of entries in the ZIP file
90ce3da70b43 Initial load
duke
parents:
diff changeset
   695
     * @throws IllegalStateException if the zip file has been closed
90ce3da70b43 Initial load
duke
parents:
diff changeset
   696
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   697
    public int size() {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   698
        synchronized (this) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   699
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   700
            return res.zsrc.total;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   701
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   702
    }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   703
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   704
    private static class CleanableResource implements Runnable {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   705
        // The outstanding inputstreams that need to be closed
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   706
        final Set<InputStream> istreams;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   707
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   708
        // List of cached Inflater objects for decompression
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   709
        Deque<Inflater> inflaterCache;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   710
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   711
        final Cleanable cleanable;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   712
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   713
        Source zsrc;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   714
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   715
        CleanableResource(ZipFile zf, File file, int mode) throws IOException {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   716
            this.cleanable = CleanerFactory.cleaner().register(zf, this);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   717
            this.istreams = Collections.newSetFromMap(new WeakHashMap<>());
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   718
            this.inflaterCache = new ArrayDeque<>();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   719
            this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   720
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   721
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   722
        void clean() {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   723
            cleanable.clean();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   724
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   725
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   726
        /*
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   727
         * Gets an inflater from the list of available inflaters or allocates
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   728
         * a new one.
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   729
         */
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   730
        Inflater getInflater() {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   731
            Inflater inf;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   732
            synchronized (inflaterCache) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   733
                if ((inf = inflaterCache.poll()) != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   734
                    return inf;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   735
                }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   736
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   737
            return new Inflater(true);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   738
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   739
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   740
        /*
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   741
         * Releases the specified inflater to the list of available inflaters.
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   742
         */
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   743
        void releaseInflater(Inflater inf) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   744
            Deque<Inflater> inflaters = this.inflaterCache;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   745
            if (inflaters != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   746
                synchronized (inflaters) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   747
                    // double checked!
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   748
                    if (inflaters == this.inflaterCache) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   749
                        inf.reset();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   750
                        inflaters.add(inf);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   751
                        return;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   752
                    }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   753
                }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   754
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   755
            // inflaters cache already closed - just end it.
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   756
            inf.end();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   757
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   758
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   759
        public void run() {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   760
            IOException ioe = null;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   761
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   762
            // Release cached inflaters and close the cache first
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   763
            Deque<Inflater> inflaters = this.inflaterCache;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   764
            if (inflaters != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   765
                synchronized (inflaters) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   766
                    // no need to double-check as only one thread gets a
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   767
                    // chance to execute run() (Cleaner guarantee)...
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   768
                    Inflater inf;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   769
                    while ((inf = inflaters.poll()) != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   770
                        inf.end();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   771
                    }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   772
                    // close inflaters cache
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   773
                    this.inflaterCache = null;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   774
                }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   775
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   776
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   777
            // Close streams, release their inflaters
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   778
            if (istreams != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   779
                synchronized (istreams) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   780
                    if (!istreams.isEmpty()) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   781
                        InputStream[] copy = istreams.toArray(new InputStream[0]);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   782
                        istreams.clear();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   783
                        for (InputStream is : copy) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   784
                            try {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   785
                                is.close();
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   786
                            } catch (IOException e) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   787
                                if (ioe == null) ioe = e;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   788
                                else ioe.addSuppressed(e);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   789
                            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   790
                        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   791
                    }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   792
                }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   793
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   794
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   795
            // Release zip src
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   796
            if (zsrc != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   797
                synchronized (zsrc) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   798
                    try {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   799
                        Source.release(zsrc);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   800
                        zsrc = null;
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   801
                    } catch (IOException e) {
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   802
                        if (ioe == null) ioe = e;
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   803
                        else ioe.addSuppressed(e);
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   804
                    }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   805
                }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   806
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   807
            if (ioe != null) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   808
                throw new UncheckedIOException(ioe);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   809
            }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   810
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   811
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   812
        CleanableResource(File file, int mode)
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   813
            throws IOException {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   814
            this.cleanable = null;
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   815
            this.istreams = Collections.newSetFromMap(new WeakHashMap<>());
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   816
            this.inflaterCache = new ArrayDeque<>();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   817
            this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0);
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   818
        }
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   819
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   820
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   821
90ce3da70b43 Initial load
duke
parents:
diff changeset
   822
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   823
     * Closes the ZIP file.
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   824
     *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   825
     * <p> Closing this ZIP file will close all of the input streams
90ce3da70b43 Initial load
duke
parents:
diff changeset
   826
     * previously returned by invocations of the {@link #getInputStream
90ce3da70b43 Initial load
duke
parents:
diff changeset
   827
     * getInputStream} method.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   828
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   829
     * @throws IOException if an I/O error has occurred
90ce3da70b43 Initial load
duke
parents:
diff changeset
   830
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   831
    public void close() throws IOException {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   832
        if (closeRequested) {
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   833
            return;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   834
        }
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   835
        closeRequested = true;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   836
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
   837
        synchronized (this) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   838
            // Close streams, release their inflaters, release cached inflaters
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   839
            // and release zip source
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   840
            try {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   841
                res.clean();
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   842
            } catch (UncheckedIOException ioe) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   843
                throw ioe.getCause();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   844
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   845
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   846
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   847
90ce3da70b43 Initial load
duke
parents:
diff changeset
   848
    private void ensureOpen() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   849
        if (closeRequested) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   850
            throw new IllegalStateException("zip file closed");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   851
        }
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   852
        if (res.zsrc == null) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   853
            throw new IllegalStateException("The object is not initialized.");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   854
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   855
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   856
90ce3da70b43 Initial load
duke
parents:
diff changeset
   857
    private void ensureOpenOrZipException() throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   858
        if (closeRequested) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   859
            throw new ZipException("ZipFile closed");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   860
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   861
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   862
90ce3da70b43 Initial load
duke
parents:
diff changeset
   863
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   864
     * Inner class implementing the input stream used to read a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   865
     * (possibly compressed) zip file entry.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   866
     */
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   867
    private class ZipFileInputStream extends InputStream {
34774
03b4e6dc367b 8145680: Remove unnecessary explicit initialization of volatile variables in java.base
redestad
parents: 34693
diff changeset
   868
        private volatile boolean closeRequested;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   869
        private   long pos;     // current position within entry data
58864
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   870
        private   long startingPos; // Start position for the entry data
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   871
        protected long rem;     // number of remaining bytes within entry
90ce3da70b43 Initial load
duke
parents:
diff changeset
   872
        protected long size;    // uncompressed size of this entry
90ce3da70b43 Initial load
duke
parents:
diff changeset
   873
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   874
        ZipFileInputStream(byte[] cen, int cenpos) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   875
            rem = CENSIZ(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   876
            size = CENLEN(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   877
            pos = CENOFF(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   878
            // zip64
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   879
            if (rem == ZIP64_MAGICVAL || size == ZIP64_MAGICVAL ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   880
                pos == ZIP64_MAGICVAL) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   881
                checkZIP64(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   882
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   883
            // negative for lazy initialization, see getDataOffset();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   884
            pos = - (pos + ZipFile.this.res.zsrc.locpos);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   885
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   886
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   887
        private void checkZIP64(byte[] cen, int cenpos) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   888
            int off = cenpos + CENHDR + CENNAM(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   889
            int end = off + CENEXT(cen, cenpos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   890
            while (off + 4 < end) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   891
                int tag = get16(cen, off);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   892
                int sz = get16(cen, off + 2);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   893
                off += 4;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   894
                if (off + sz > end)         // invalid data
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   895
                    break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   896
                if (tag == EXTID_ZIP64) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   897
                    if (size == ZIP64_MAGICVAL) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   898
                        if (sz < 8 || (off + 8) > end)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   899
                            break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   900
                        size = get64(cen, off);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   901
                        sz -= 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   902
                        off += 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   903
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   904
                    if (rem == ZIP64_MAGICVAL) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   905
                        if (sz < 8 || (off + 8) > end)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   906
                            break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   907
                        rem = get64(cen, off);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   908
                        sz -= 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   909
                        off += 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   910
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   911
                    if (pos == ZIP64_MAGICVAL) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   912
                        if (sz < 8 || (off + 8) > end)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   913
                            break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   914
                        pos = get64(cen, off);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   915
                        sz -= 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   916
                        off += 8;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   917
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   918
                    break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   919
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   920
                off += sz;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   921
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   922
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   923
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   924
        /*
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   925
         * The Zip file spec explicitly allows the LOC extra data size to
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   926
         * be different from the CEN extra data size. Since we cannot trust
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   927
         * the CEN extra data size, we need to read the LOC to determine
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   928
         * the entry data offset.
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
   929
         */
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   930
        private long initDataOffset() throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   931
            if (pos <= 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   932
                byte[] loc = new byte[LOCHDR];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   933
                pos = -pos;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   934
                int len = ZipFile.this.res.zsrc.readFullyAt(loc, 0, loc.length, pos);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   935
                if (len != LOCHDR) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   936
                    throw new ZipException("ZipFile error reading zip file");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   937
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   938
                if (LOCSIG(loc) != LOCSIG) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   939
                    throw new ZipException("ZipFile invalid LOC header (bad signature)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   940
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   941
                pos += LOCHDR + LOCNAM(loc) + LOCEXT(loc);
58864
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   942
                startingPos = pos; // Save starting position for the entry
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   943
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   944
            return pos;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   945
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   946
90ce3da70b43 Initial load
duke
parents:
diff changeset
   947
        public int read(byte b[], int off, int len) throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   948
            synchronized (ZipFile.this) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   949
                ensureOpenOrZipException();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   950
                initDataOffset();
23741
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   951
                if (rem == 0) {
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   952
                    return -1;
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   953
                }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   954
                if (len > rem) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   955
                    len = (int) rem;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   956
                }
23741
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   957
                if (len <= 0) {
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   958
                    return 0;
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   959
                }
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
   960
                len = ZipFile.this.res.zsrc.readAt(b, off, len, pos);
23741
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   961
                if (len > 0) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   962
                    pos += len;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   963
                    rem -= len;
23741
03987fb914a9 8038491: Improve synchronization in ZipFile.read()
coffeys
parents: 19374
diff changeset
   964
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   965
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   966
            if (rem == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   967
                close();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   968
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   969
            return len;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   970
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   971
90ce3da70b43 Initial load
duke
parents:
diff changeset
   972
        public int read() throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   973
            byte[] b = new byte[1];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   974
            if (read(b, 0, 1) == 1) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   975
                return b[0] & 0xff;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   976
            } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   977
                return -1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   978
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   979
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   980
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   981
        public long skip(long n) throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   982
            synchronized (ZipFile.this) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   983
                initDataOffset();
58864
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   984
                long newPos = pos + n;
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   985
                if (n > 0) {
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   986
                    // If we overflowed adding the skip value or are moving
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   987
                    // past EOF, set the skip value to number of bytes remaining
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   988
                    // to reach EOF
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   989
                    if (newPos < 0 || n > rem) {
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   990
                        n = rem;
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   991
                    }
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   992
                } else if (newPos < startingPos) {
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   993
                    // Tried to position before BOF so set position to the
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   994
                    // BOF and return the number of bytes we moved backwards
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   995
                    // to reach BOF
fba8635290df 8231451: ZipFileInputStream::skip handling of negative values with STORED entries
lancea
parents: 57670
diff changeset
   996
                    n = startingPos - pos;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   997
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   998
                pos += n;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
   999
                rem -= n;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1000
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1001
            if (rem == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1002
                close();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1003
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1004
            return n;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1005
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1006
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1007
        public int available() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1008
            return rem > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) rem;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1009
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1010
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1011
        public long size() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1012
            return size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1013
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1014
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1015
        public void close() {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1016
            if (closeRequested) {
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
  1017
                return;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1018
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1019
            closeRequested = true;
34526
f1f852f5f477 8144958: changes by JDK-8142508 seems to have broken jtreg
sherman
parents: 34525
diff changeset
  1020
            rem = 0;
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1021
            synchronized (res.istreams) {
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1022
                res.istreams.remove(this);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1023
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1024
        }
9281
41e796d1b6c1 7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents: 9035
diff changeset
  1025
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1026
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1027
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1028
    /**
38467
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1029
     * Returns the names of all non-directory entries that begin with
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1030
     * "META-INF/" (case ignored). This method is used in JarFile, via
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1031
     * SharedSecrets, as an optimization when looking up manifest and
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1032
     * signature file entries. Returns null if no entries were found.
18223
35a5c2462991 8008593: Better URLClassLoader resource management
chegar
parents: 9676
diff changeset
  1033
     */
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1034
    private String[] getMetaInfEntryNames() {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1035
        synchronized (this) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1036
            ensureOpen();
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1037
            Source zsrc = res.zsrc;
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1038
            if (zsrc.metanames == null) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1039
                return null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1040
            }
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1041
            String[] names = new String[zsrc.metanames.length];
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1042
            byte[] cen = zsrc.cen;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1043
            for (int i = 0; i < names.length; i++) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1044
                int pos = zsrc.metanames[i];
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1045
                names[i] = new String(cen, pos + CENHDR, CENNAM(cen, pos),
34693
5b58b6cdc196 8145343: CorruptEntry.java fails after push for JDK-8145260
sherman
parents: 34686
diff changeset
  1046
                                      StandardCharsets.UTF_8);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1047
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1048
            return names;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1049
        }
18223
35a5c2462991 8008593: Better URLClassLoader resource management
chegar
parents: 9676
diff changeset
  1050
    }
2592
ef26f663a2ba 4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents: 1158
diff changeset
  1051
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1052
    private static boolean isWindows;
49585
cb18edeaeca7 8201443: NoSuchMethodException JarFile.open when jar file is used in classpath
sherman
parents: 49442
diff changeset
  1053
    private static final JavaLangAccess JLA;
cb18edeaeca7 8201443: NoSuchMethodException JarFile.open when jar file is used in classpath
sherman
parents: 49442
diff changeset
  1054
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1055
    static {
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1056
        SharedSecrets.setJavaUtilZipFileAccess(
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1057
            new JavaUtilZipFileAccess() {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1058
                @Override
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1059
                public boolean startsWithLocHeader(ZipFile zip) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1060
                    return zip.res.zsrc.startsWithLoc;
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1061
                }
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1062
                @Override
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1063
                public String[] getMetaInfEntryNames(ZipFile zip) {
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1064
                    return zip.getMetaInfEntryNames();
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1065
                }
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1066
                @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1067
                public JarEntry getEntry(ZipFile zip, String name,
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1068
                    Function<String, JarEntry> func) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1069
                    return (JarEntry)zip.getEntry(name, func);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1070
                }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1071
                @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1072
                public Enumeration<JarEntry> entries(ZipFile zip,
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1073
                    Function<String, JarEntry> func) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1074
                    return zip.entries(func);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1075
                }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1076
                @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1077
                public Stream<JarEntry> stream(ZipFile zip,
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1078
                    Function<String, JarEntry> func) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1079
                    return zip.stream(func);
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1080
                }
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1081
                @Override
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1082
                public Stream<String> entryNameStream(ZipFile zip) {
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1083
                    return zip.entryNameStream();
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47223
diff changeset
  1084
                }
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1085
             }
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1086
        );
52427
3c6aa484536c 8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents: 52305
diff changeset
  1087
        JLA = SharedSecrets.getJavaLangAccess();
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1088
        isWindows = VM.getSavedProperty("os.name").contains("Windows");
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1089
    }
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1090
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1091
    private static class Source {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1092
        private final Key key;               // the key in files
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1093
        private int refs = 1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1094
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1095
        private RandomAccessFile zfile;      // zfile of the underlying zip file
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1096
        private byte[] cen;                  // CEN & ENDHDR
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1097
        private long locpos;                 // position of first LOC header (usually 0)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1098
        private byte[] comment;              // zip file comment
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1099
                                             // list of meta entries in META-INF dir
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1100
        private int[] metanames;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1101
        private final boolean startsWithLoc; // true, if zip file starts with LOCSIG (usually true)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1102
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1103
        // A Hashmap for all entries.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1104
        //
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1105
        // A cen entry of Zip/JAR file. As we have one for every entry in every active Zip/JAR,
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1106
        // We might have a lot of these in a typical system. In order to save space we don't
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1107
        // keep the name in memory, but merely remember a 32 bit {@code hash} value of the
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1108
        // entry name and its offset {@code pos} in the central directory hdeader.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1109
        //
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1110
        // private static class Entry {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1111
        //     int hash;       // 32 bit hashcode on name
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1112
        //     int next;       // hash chain: index into entries
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1113
        //     int pos;        // Offset of central directory file header
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1114
        // }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1115
        // private Entry[] entries;             // array of hashed cen entry
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1116
        //
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1117
        // To reduce the total size of entries further, we use a int[] here to store 3 "int"
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1118
        // {@code hash}, {@code next and {@code "pos for each entry. The entry can then be
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1119
        // referred by their index of their positions in the {@code entries}.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1120
        //
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1121
        private int[] entries;                  // array of hashed cen entry
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1122
        private int addEntry(int index, int hash, int next, int pos) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1123
            entries[index++] = hash;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1124
            entries[index++] = next;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1125
            entries[index++] = pos;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1126
            return index;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1127
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1128
        private int getEntryHash(int index) { return entries[index]; }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1129
        private int getEntryNext(int index) { return entries[index + 1]; }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1130
        private int getEntryPos(int index)  { return entries[index + 2]; }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1131
        private static final int ZIP_ENDCHAIN  = -1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1132
        private int total;                   // total number of entries
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1133
        private int[] table;                 // Hash chain heads: indexes into entries
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1134
        private int tablelen;                // number of hash heads
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1135
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1136
        private static class Key {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1137
            BasicFileAttributes attrs;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1138
            File file;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1139
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1140
            public Key(File file, BasicFileAttributes attrs) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1141
                this.attrs = attrs;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1142
                this.file = file;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1143
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1144
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1145
            public int hashCode() {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1146
                long t = attrs.lastModifiedTime().toMillis();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1147
                return ((int)(t ^ (t >>> 32))) + file.hashCode();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1148
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1149
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1150
            public boolean equals(Object obj) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1151
                if (obj instanceof Key) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1152
                    Key key = (Key)obj;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1153
                    if (!attrs.lastModifiedTime().equals(key.attrs.lastModifiedTime())) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1154
                        return false;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1155
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1156
                    Object fk = attrs.fileKey();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1157
                    if (fk != null) {
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
  1158
                        return fk.equals(key.attrs.fileKey());
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1159
                    } else {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1160
                        return file.equals(key.file);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1161
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1162
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1163
                return false;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1164
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1165
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1166
        private static final HashMap<Key, Source> files = new HashMap<>();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1167
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1168
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1169
        static Source get(File file, boolean toDelete) throws IOException {
52034
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1170
            final Key key;
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1171
            try {
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1172
                key = new Key(file,
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1173
                        Files.readAttributes(file.toPath(), BasicFileAttributes.class));
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1174
            } catch (InvalidPathException ipe) {
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1175
                throw new IOException(ipe);
c83bc5def0d4 8211765: JarFile constructor throws undocumented exception
lancea
parents: 50238
diff changeset
  1176
            }
49442
d6d1c06becda 8200124: Various cleanups in jar/zip
martin
parents: 48337
diff changeset
  1177
            Source src;
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1178
            synchronized (files) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1179
                src = files.get(key);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1180
                if (src != null) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1181
                    src.refs++;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1182
                    return src;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1183
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1184
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1185
            src = new Source(key, toDelete);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1186
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1187
            synchronized (files) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1188
                if (files.containsKey(key)) {    // someone else put in first
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1189
                    src.close();                 // close the newly created one
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1190
                    src = files.get(key);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1191
                    src.refs++;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1192
                    return src;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1193
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1194
                files.put(key, src);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1195
                return src;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1196
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1197
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1198
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1199
        static void release(Source src) throws IOException {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1200
            synchronized (files) {
48238
9f225d4387e2 8185582: Update Zip implementation to use Cleaner, not finalizers
sherman
parents: 47987
diff changeset
  1201
                if (src != null && --src.refs == 0) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1202
                    files.remove(src.key);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1203
                    src.close();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1204
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1205
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1206
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1207
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1208
        private Source(Key key, boolean toDelete) throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1209
            this.key = key;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1210
            if (toDelete) {
38466
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1211
                if (isWindows) {
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1212
                    this.zfile = SharedSecrets.getJavaIORandomAccessFileAccess()
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1213
                                              .openAndDelete(key.file, "r");
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1214
                } else {
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1215
                    this.zfile = new RandomAccessFile(key.file, "r");
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1216
                    key.file.delete();
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1217
                }
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1218
            } else {
4bcf5f2bb351 8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents: 38375
diff changeset
  1219
                this.zfile = new RandomAccessFile(key.file, "r");
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1220
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1221
            try {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1222
                initCEN(-1);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1223
                byte[] buf = new byte[4];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1224
                readFullyAt(buf, 0, 4, 0);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1225
                this.startsWithLoc = (LOCSIG(buf) == LOCSIG);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1226
            } catch (IOException x) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1227
                try {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1228
                    this.zfile.close();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1229
                } catch (IOException xx) {}
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1230
                throw x;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1231
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1232
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1233
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1234
        private void close() throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1235
            zfile.close();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1236
            zfile = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1237
            cen = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1238
            entries = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1239
            table = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1240
            metanames = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1241
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1242
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1243
        private static final int BUF_SIZE = 8192;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1244
        private final int readFullyAt(byte[] buf, int off, int len, long pos)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1245
            throws IOException
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1246
        {
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
  1247
            synchronized (zfile) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1248
                zfile.seek(pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1249
                int N = len;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1250
                while (N > 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1251
                    int n = Math.min(BUF_SIZE, N);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1252
                    zfile.readFully(buf, off, n);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1253
                    off += n;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1254
                    N -= n;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1255
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1256
                return len;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1257
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1258
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1259
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1260
        private final int readAt(byte[] buf, int off, int len, long pos)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1261
            throws IOException
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1262
        {
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
  1263
            synchronized (zfile) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1264
                zfile.seek(pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1265
                return zfile.read(buf, off, len);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1266
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1267
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1268
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1269
        private static final int hashN(byte[] a, int off, int len) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1270
            int h = 1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1271
            while (len-- > 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1272
                h = 31 * h + a[off++];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1273
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1274
            return h;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1275
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1276
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1277
        private static final int hash_append(int hash, byte b) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1278
            return hash * 31 + b;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1279
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1280
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1281
        private static class End {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1282
            int  centot;     // 4 bytes
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1283
            long cenlen;     // 4 bytes
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1284
            long cenoff;     // 4 bytes
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1285
            long endpos;     // 4 bytes
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1286
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1287
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1288
        /*
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1289
         * Searches for end of central directory (END) header. The contents of
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1290
         * the END header will be read and placed in endbuf. Returns the file
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1291
         * position of the END header, otherwise returns -1 if the END header
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1292
         * was not found or an error occurred.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1293
         */
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1294
        private End findEND() throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1295
            long ziplen = zfile.length();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1296
            if (ziplen <= 0)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1297
                zerror("zip file is empty");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1298
            End end = new End();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1299
            byte[] buf = new byte[READBLOCKSZ];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1300
            long minHDR = (ziplen - END_MAXLEN) > 0 ? ziplen - END_MAXLEN : 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1301
            long minPos = minHDR - (buf.length - ENDHDR);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1302
            for (long pos = ziplen - buf.length; pos >= minPos; pos -= (buf.length - ENDHDR)) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1303
                int off = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1304
                if (pos < 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1305
                    // Pretend there are some NUL bytes before start of file
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1306
                    off = (int)-pos;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1307
                    Arrays.fill(buf, 0, off, (byte)0);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1308
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1309
                int len = buf.length - off;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1310
                if (readFullyAt(buf, off, len, pos + off) != len ) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1311
                    zerror("zip END header not found");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1312
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1313
                // Now scan the block backwards for END header signature
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1314
                for (int i = buf.length - ENDHDR; i >= 0; i--) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1315
                    if (buf[i+0] == (byte)'P'    &&
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1316
                        buf[i+1] == (byte)'K'    &&
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1317
                        buf[i+2] == (byte)'\005' &&
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1318
                        buf[i+3] == (byte)'\006') {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1319
                        // Found ENDSIG header
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1320
                        byte[] endbuf = Arrays.copyOfRange(buf, i, i + ENDHDR);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1321
                        end.centot = ENDTOT(endbuf);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1322
                        end.cenlen = ENDSIZ(endbuf);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1323
                        end.cenoff = ENDOFF(endbuf);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1324
                        end.endpos = pos + i;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1325
                        int comlen = ENDCOM(endbuf);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1326
                        if (end.endpos + ENDHDR + comlen != ziplen) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1327
                            // ENDSIG matched, however the size of file comment in it does
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1328
                            // not match the real size. One "common" cause for this problem
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1329
                            // is some "extra" bytes are padded at the end of the zipfile.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1330
                            // Let's do some extra verification, we don't care about the
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1331
                            // performance in this situation.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1332
                            byte[] sbuf = new byte[4];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1333
                            long cenpos = end.endpos - end.cenlen;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1334
                            long locpos = cenpos - end.cenoff;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1335
                            if  (cenpos < 0 ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1336
                                 locpos < 0 ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1337
                                 readFullyAt(sbuf, 0, sbuf.length, cenpos) != 4 ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1338
                                 GETSIG(sbuf) != CENSIG ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1339
                                 readFullyAt(sbuf, 0, sbuf.length, locpos) != 4 ||
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1340
                                 GETSIG(sbuf) != LOCSIG) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1341
                                continue;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1342
                            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1343
                        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1344
                        if (comlen > 0) {    // this zip file has comlen
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1345
                            comment = new byte[comlen];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1346
                            if (readFullyAt(comment, 0, comlen, end.endpos + ENDHDR) != comlen) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1347
                                zerror("zip comment read failed");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1348
                            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1349
                        }
47223
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1350
                        // must check for a zip64 end record; it is always permitted to be present
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1351
                        try {
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1352
                            byte[] loc64 = new byte[ZIP64_LOCHDR];
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1353
                            if (end.endpos < ZIP64_LOCHDR ||
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1354
                                readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1355
                                != loc64.length || GETSIG(loc64) != ZIP64_LOCSIG) {
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1356
                                return end;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1357
                            }
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1358
                            long end64pos = ZIP64_LOCOFF(loc64);
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1359
                            byte[] end64buf = new byte[ZIP64_ENDHDR];
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1360
                            if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1361
                                != end64buf.length || GETSIG(end64buf) != ZIP64_ENDSIG) {
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1362
                                return end;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1363
                            }
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1364
                            // end64 candidate found,
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1365
                            long cenlen64 = ZIP64_ENDSIZ(end64buf);
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1366
                            long cenoff64 = ZIP64_ENDOFF(end64buf);
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1367
                            long centot64 = ZIP64_ENDTOT(end64buf);
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1368
                            // double-check
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1369
                            if (cenlen64 != end.cenlen && end.cenlen != ZIP64_MAGICVAL ||
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1370
                                cenoff64 != end.cenoff && end.cenoff != ZIP64_MAGICVAL ||
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1371
                                centot64 != end.centot && end.centot != ZIP64_MAGICCOUNT) {
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1372
                                return end;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1373
                            }
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1374
                            // to use the end64 values
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1375
                            end.cenlen = cenlen64;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1376
                            end.cenoff = cenoff64;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1377
                            end.centot = (int)centot64; // assume total < 2g
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1378
                            end.endpos = end64pos;
723486922bfe 8186464: ZipFile cannot read some InfoZip ZIP64 zip files
sherman
parents: 47216
diff changeset
  1379
                        } catch (IOException x) {}    // no zip64 loc/end
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1380
                        return end;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1381
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1382
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1383
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1384
            zerror("zip END header not found");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1385
            return null; //make compiler happy
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1386
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1387
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1388
        // Reads zip file central directory.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1389
        private void initCEN(int knownTotal) throws IOException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1390
            if (knownTotal == -1) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1391
                End end = findEND();
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1392
                if (end.endpos == 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1393
                    locpos = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1394
                    total = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1395
                    entries  = new int[0];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1396
                    cen = null;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1397
                    return;         // only END header present
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1398
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1399
                if (end.cenlen > end.endpos)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1400
                    zerror("invalid END header (bad central directory size)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1401
                long cenpos = end.endpos - end.cenlen;     // position of CEN table
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1402
                // Get position of first local file (LOC) header, taking into
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1403
                // account that there may be a stub prefixed to the zip file.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1404
                locpos = cenpos - end.cenoff;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1405
                if (locpos < 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1406
                    zerror("invalid END header (bad central directory offset)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1407
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1408
                // read in the CEN and END
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1409
                cen = new byte[(int)(end.cenlen + ENDHDR)];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1410
                if (readFullyAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1411
                    zerror("read CEN tables failed");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1412
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1413
                total = end.centot;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1414
            } else {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1415
                total = knownTotal;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1416
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1417
            // hash table for entries
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1418
            entries  = new int[total * 3];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1419
            tablelen = ((total/2) | 1); // Odd -> fewer collisions
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1420
            table    =  new int[tablelen];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1421
            Arrays.fill(table, ZIP_ENDCHAIN);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1422
            int idx = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1423
            int hash = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1424
            int next = -1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1425
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1426
            // list for all meta entries
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1427
            ArrayList<Integer> metanamesList = null;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1428
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1429
            // Iterate through the entries in the central directory
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1430
            int i = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1431
            int hsh = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1432
            int pos = 0;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1433
            int limit = cen.length - ENDHDR;
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
  1434
            while (pos + CENHDR <= limit) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1435
                if (i >= total) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1436
                    // This will only happen if the zip file has an incorrect
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1437
                    // ENDTOT field, which usually means it contains more than
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1438
                    // 65535 entries.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1439
                    initCEN(countCENHeaders(cen, limit));
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1440
                    return;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1441
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1442
                if (CENSIG(cen, pos) != CENSIG)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1443
                    zerror("invalid CEN header (bad signature)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1444
                int method = CENHOW(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1445
                int nlen   = CENNAM(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1446
                int elen   = CENEXT(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1447
                int clen   = CENCOM(cen, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1448
                if ((CENFLG(cen, pos) & 1) != 0)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1449
                    zerror("invalid CEN header (encrypted entry)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1450
                if (method != STORED && method != DEFLATED)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1451
                    zerror("invalid CEN header (bad compression method: " + method + ")");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1452
                if (pos + CENHDR + nlen > limit)
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1453
                    zerror("invalid CEN header (bad header size)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1454
                // Record the CEN offset and the name hash in our hash cell.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1455
                hash = hashN(cen, pos + CENHDR, nlen);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1456
                hsh = (hash & 0x7fffffff) % tablelen;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1457
                next = table[hsh];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1458
                table[hsh] = idx;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1459
                idx = addEntry(idx, hash, next, pos);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1460
                // Adds name to metanames.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1461
                if (isMetaName(cen, pos + CENHDR, nlen)) {
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1462
                    if (metanamesList == null)
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1463
                        metanamesList = new ArrayList<>(4);
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1464
                    metanamesList.add(pos);
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1465
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1466
                // skip ext and comment
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1467
                pos += (CENHDR + nlen + elen + clen);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1468
                i++;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1469
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1470
            total = i;
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1471
            if (metanamesList != null) {
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1472
                metanames = new int[metanamesList.size()];
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1473
                for (int j = 0, len = metanames.length; j < len; j++) {
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1474
                    metanames[j] = metanamesList.get(j);
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1475
                }
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1476
            }
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1477
            if (pos + ENDHDR != cen.length) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1478
                zerror("invalid CEN header (bad header size)");
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1479
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1480
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1481
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1482
        private static void zerror(String msg) throws ZipException {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1483
            throw new ZipException(msg);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1484
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1485
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1486
        /*
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1487
         * Returns the {@code pos} of the zip cen entry corresponding to the
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1488
         * specified entry name, or -1 if not found.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1489
         */
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1490
        private int getEntryPos(byte[] name, boolean addSlash) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1491
            if (total == 0) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1492
                return -1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1493
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1494
            int hsh = hashN(name, 0, name.length);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1495
            int idx = table[(hsh & 0x7fffffff) % tablelen];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1496
            /*
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1497
             * This while loop is an optimization where a double lookup
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1498
             * for name and name+/ is being performed. The name char
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1499
             * array has enough room at the end to try again with a
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1500
             * slash appended if the first table lookup does not succeed.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1501
             */
50238
a9307f400f5a 8203328: Rename EFS in java.util.zip internals to something meaningful
martin
parents: 49585
diff changeset
  1502
            while (true) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1503
                /*
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1504
                 * Search down the target hash chain for a entry whose
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1505
                 * 32 bit hash matches the hashed name.
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1506
                 */
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1507
                while (idx != ZIP_ENDCHAIN) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1508
                    if (getEntryHash(idx) == hsh) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1509
                        // The CEN name must match the specfied one
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1510
                        int pos = getEntryPos(idx);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1511
                        if (name.length == CENNAM(cen, pos)) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1512
                            boolean matched = true;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1513
                            int nameoff = pos + CENHDR;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1514
                            for (int i = 0; i < name.length; i++) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1515
                                if (name[i] != cen[nameoff++]) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1516
                                    matched = false;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1517
                                    break;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1518
                                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1519
                            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1520
                            if (matched) {
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1521
                                return pos;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1522
                            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1523
                         }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1524
                    }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1525
                    idx = getEntryNext(idx);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1526
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1527
                /* If not addSlash, or slash is already there, we are done */
34874
55a62be87e89 8146431: j.u.z.ZipFile.getEntry("") throws AIOOBE
sherman
parents: 34774
diff changeset
  1528
                if (!addSlash  || name.length == 0 || name[name.length - 1] == '/') {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1529
                     return -1;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1530
                }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1531
                /* Add slash and try once more */
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1532
                name = Arrays.copyOf(name, name.length + 1);
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1533
                name[name.length - 1] = '/';
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1534
                hsh = hash_append(hsh, (byte)'/');
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1535
                //idx = table[hsh % tablelen];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1536
                idx = table[(hsh & 0x7fffffff) % tablelen];
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1537
                addSlash = false;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1538
            }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1539
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1540
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1541
        /**
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1542
         * Returns true if the bytes represent a non-directory name
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1543
         * beginning with "META-INF/", disregarding ASCII case.
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1544
         */
38375
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1545
        private static boolean isMetaName(byte[] name, int off, int len) {
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1546
            // Use the "oldest ASCII trick in the book"
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1547
            return len > 9                     // "META-INF/".length()
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1548
                && name[off + len - 1] != '/'  // non-directory
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1549
                && (name[off++] | 0x20) == 'm'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1550
                && (name[off++] | 0x20) == 'e'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1551
                && (name[off++] | 0x20) == 't'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1552
                && (name[off++] | 0x20) == 'a'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1553
                && (name[off++]       ) == '-'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1554
                && (name[off++] | 0x20) == 'i'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1555
                && (name[off++] | 0x20) == 'n'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1556
                && (name[off++] | 0x20) == 'f'
5df893ca926c 8157069: Assorted ZipFile improvements
martin
parents: 34953
diff changeset
  1557
                && (name[off]         ) == '/';
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1558
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1559
38467
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1560
        /**
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1561
         * Returns the number of CEN headers in a central directory.
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1562
         * Will not throw, even if the zip file is corrupt.
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1563
         *
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1564
         * @param cen copy of the bytes in a zip file's central directory
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1565
         * @param size number of bytes in central directory
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1566
         */
38467
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1567
        private static int countCENHeaders(byte[] cen, int size) {
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1568
            int count = 0;
38467
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1569
            for (int p = 0;
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1570
                 p + CENHDR <= size;
172e0c9007a6 8157613: Internal documentation improvements to ZipFile.java
martin
parents: 38466
diff changeset
  1571
                 p += CENHDR + CENNAM(cen, p) + CENEXT(cen, p) + CENCOM(cen, p))
34686
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1572
                count++;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1573
            return count;
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1574
        }
29ea8310a27a 8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents: 34526
diff changeset
  1575
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1576
}