author | martin |
Mon, 23 May 2016 12:44:55 -0700 | |
changeset 38467 | 172e0c9007a6 |
parent 38466 | 4bcf5f2bb351 |
child 39310 | fed59f4021c8 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
29226 | 2 |
* Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package java.util.zip; |
|
27 |
||
3078 | 28 |
import java.io.Closeable; |
2 | 29 |
import java.io.InputStream; |
30 |
import java.io.IOException; |
|
31 |
import java.io.EOFException; |
|
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; |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
34 |
import java.nio.charset.Charset; |
9676
5663e62f8d7e
7041612: Rename StandardCharset to StandardCharsets
mduigou
parents:
9526
diff
changeset
|
35 |
import java.nio.charset.StandardCharsets; |
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
|
36 |
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
|
37 |
import java.nio.file.Path; |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
38 |
import java.nio.file.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
|
39 |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
40 |
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
|
41 |
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
|
42 |
import java.util.Arrays; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
43 |
import java.util.Deque; |
2 | 44 |
import java.util.Enumeration; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
45 |
import java.util.HashMap; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
46 |
import java.util.Iterator; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
47 |
import java.util.Map; |
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
|
48 |
import java.util.Objects; |
2 | 49 |
import java.util.NoSuchElementException; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
50 |
import java.util.Spliterator; |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
51 |
import java.util.Spliterators; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
52 |
import java.util.WeakHashMap; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
53 |
import java.util.stream.Stream; |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
54 |
import java.util.stream.StreamSupport; |
32834
e1dca5fe4de3
8137056: Move SharedSecrets and interface friends out of sun.misc
chegar
parents:
32037
diff
changeset
|
55 |
import jdk.internal.misc.JavaUtilZipFileAccess; |
e1dca5fe4de3
8137056: Move SharedSecrets and interface friends out of sun.misc
chegar
parents:
32037
diff
changeset
|
56 |
import jdk.internal.misc.SharedSecrets; |
38466
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
57 |
import jdk.internal.misc.JavaIORandomAccessFileAccess; |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
58 |
import jdk.internal.misc.VM; |
34953
67245e3259bf
8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents:
34874
diff
changeset
|
59 |
import jdk.internal.perf.PerfCounter; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
60 |
|
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
|
61 |
import static java.util.zip.ZipConstants.*; |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
62 |
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
|
63 |
import static java.util.zip.ZipUtils.*; |
2 | 64 |
|
65 |
/** |
|
66 |
* This class is used to read entries from a zip file. |
|
67 |
* |
|
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
|
68 |
* <p> Unless otherwise noted, passing a {@code null} argument to a constructor |
2 | 69 |
* or method in this class will cause a {@link NullPointerException} to be |
70 |
* thrown. |
|
71 |
* |
|
72 |
* @author David Connelly |
|
73 |
*/ |
|
74 |
public |
|
3078 | 75 |
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
|
76 |
|
18223 | 77 |
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
|
78 |
private volatile boolean closeRequested; |
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
|
79 |
private Source zsrc; |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
80 |
private ZipCoder zc; |
2 | 81 |
|
82 |
private static final int STORED = ZipEntry.STORED; |
|
83 |
private static final int DEFLATED = ZipEntry.DEFLATED; |
|
84 |
||
85 |
/** |
|
86 |
* Mode flag to open a zip file for reading. |
|
87 |
*/ |
|
88 |
public static final int OPEN_READ = 0x1; |
|
89 |
||
90 |
/** |
|
91 |
* Mode flag to open a zip file and mark it for deletion. The file will be |
|
92 |
* deleted some time between the moment that it is opened and the moment |
|
93 |
* 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
|
94 |
* {@code ZipFile} object until either the close method is invoked or the |
2 | 95 |
* virtual machine exits. |
96 |
*/ |
|
97 |
public static final int OPEN_DELETE = 0x4; |
|
98 |
||
99 |
/** |
|
100 |
* Opens a zip file for reading. |
|
101 |
* |
|
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
|
102 |
* <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
|
103 |
* 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
|
104 |
* to ensure the read is allowed. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
105 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
106 |
* <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
|
107 |
* decode the entry names and comments. |
2 | 108 |
* |
109 |
* @param name the name of the zip file |
|
110 |
* @throws ZipException if a ZIP format error has occurred |
|
111 |
* @throws IOException if an I/O error has occurred |
|
112 |
* @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
|
113 |
* {@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
|
114 |
* |
2 | 115 |
* @see SecurityManager#checkRead(java.lang.String) |
116 |
*/ |
|
117 |
public ZipFile(String name) throws IOException { |
|
118 |
this(new File(name), OPEN_READ); |
|
119 |
} |
|
120 |
||
121 |
/** |
|
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
|
122 |
* 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
|
123 |
* {@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
|
124 |
* must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}. |
2 | 125 |
* |
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
|
126 |
* <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
|
127 |
* method is called with the {@code name} argument as its argument to |
2 | 128 |
* ensure the read is allowed. |
129 |
* |
|
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
130 |
* <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
|
131 |
* decode the entry names and comments |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
132 |
* |
2 | 133 |
* @param file the ZIP file to be opened for reading |
134 |
* @param mode the mode in which the file is to be opened |
|
135 |
* @throws ZipException if a ZIP format error has occurred |
|
136 |
* @throws IOException if an I/O error has occurred |
|
137 |
* @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
|
138 |
* its {@code checkRead} method |
2 | 139 |
* 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
|
140 |
* 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
|
141 |
* 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
|
142 |
* @throws IllegalArgumentException if the {@code mode} argument is invalid |
2 | 143 |
* @see SecurityManager#checkRead(java.lang.String) |
144 |
* @since 1.3 |
|
145 |
*/ |
|
146 |
public ZipFile(File file, int mode) throws IOException { |
|
9676
5663e62f8d7e
7041612: Rename StandardCharset to StandardCharsets
mduigou
parents:
9526
diff
changeset
|
147 |
this(file, mode, StandardCharsets.UTF_8); |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
148 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
149 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
150 |
/** |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
151 |
* 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
|
152 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
153 |
* <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
|
154 |
* decode the entry names and comments. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
155 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
156 |
* @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
|
157 |
* @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
|
158 |
* @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
|
159 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
160 |
public ZipFile(File file) throws ZipException, IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
161 |
this(file, OPEN_READ); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
162 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
163 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
164 |
/** |
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
|
165 |
* 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
|
166 |
* {@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
|
167 |
* 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
|
168 |
* |
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
|
169 |
* <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
|
170 |
* 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
|
171 |
* ensure the read is allowed. |
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 |
* @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
|
174 |
* @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
|
175 |
* @param charset |
2704
a92617170304
6836489: Incorrect @link usage in java.util.zip API doc
sherman
parents:
2592
diff
changeset
|
176 |
* 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
|
177 |
* 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
|
178 |
* 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
|
179 |
* purpose flag). |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
180 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
181 |
* @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
|
182 |
* @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
|
183 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
184 |
* @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
|
185 |
* 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
|
186 |
* 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
|
187 |
* {@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
|
188 |
* 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
|
189 |
* |
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
|
190 |
* @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
|
191 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
192 |
* @see SecurityManager#checkRead(java.lang.String) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
193 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
194 |
* @since 1.7 |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
195 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
196 |
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
|
197 |
{ |
2 | 198 |
if (((mode & OPEN_READ) == 0) || |
199 |
((mode & ~(OPEN_READ | OPEN_DELETE)) != 0)) { |
|
200 |
throw new IllegalArgumentException("Illegal mode: 0x"+ |
|
201 |
Integer.toHexString(mode)); |
|
202 |
} |
|
203 |
String name = file.getPath(); |
|
204 |
SecurityManager sm = System.getSecurityManager(); |
|
205 |
if (sm != null) { |
|
206 |
sm.checkRead(name); |
|
207 |
if ((mode & OPEN_DELETE) != 0) { |
|
208 |
sm.checkDelete(name); |
|
209 |
} |
|
210 |
} |
|
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
|
211 |
Objects.requireNonNull(charset, "charset"); |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
212 |
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
|
213 |
this.name = name; |
3849 | 214 |
long t0 = System.nanoTime(); |
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
|
215 |
this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0); |
34953
67245e3259bf
8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents:
34874
diff
changeset
|
216 |
PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0); |
67245e3259bf
8146736: Move sun.misc performance counters to jdk.internal.perf
chegar
parents:
34874
diff
changeset
|
217 |
PerfCounter.getZipFileCount().increment(); |
2 | 218 |
} |
219 |
||
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
220 |
/** |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
221 |
* Opens a zip file for reading. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
222 |
* |
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
|
223 |
* <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
|
224 |
* 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
|
225 |
* to ensure the read is allowed. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
226 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
227 |
* @param name the name of the zip file |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
228 |
* @param charset |
2704
a92617170304
6836489: Incorrect @link usage in java.util.zip API doc
sherman
parents:
2592
diff
changeset
|
229 |
* 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
|
230 |
* 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
|
231 |
* 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
|
232 |
* purpose flag). |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
233 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
234 |
* @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
|
235 |
* @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
|
236 |
* @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
|
237 |
* 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
|
238 |
* 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
|
239 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
240 |
* @see SecurityManager#checkRead(java.lang.String) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
241 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
242 |
* @since 1.7 |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
243 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
244 |
public ZipFile(String name, Charset charset) throws IOException |
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 |
this(new File(name), OPEN_READ, charset); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
247 |
} |
2 | 248 |
|
249 |
/** |
|
250 |
* 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
|
251 |
* |
2 | 252 |
* @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
|
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 be |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
255 |
* 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
|
256 |
* 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
|
257 |
* 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
|
258 |
* flag is set). |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
259 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
260 |
* @throws ZipException if a ZIP format error has occurred |
2 | 261 |
* @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
|
262 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
263 |
* @since 1.7 |
2 | 264 |
*/ |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
265 |
public ZipFile(File file, Charset charset) throws IOException |
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 |
this(file, OPEN_READ, charset); |
2 | 268 |
} |
269 |
||
270 |
/** |
|
3078 | 271 |
* Returns the zip file comment, or null if none. |
272 |
* |
|
273 |
* @return the comment string for the zip file, or null if none |
|
274 |
* |
|
275 |
* @throws IllegalStateException if the zip file has been closed |
|
276 |
* |
|
277 |
* Since 1.7 |
|
278 |
*/ |
|
279 |
public String getComment() { |
|
280 |
synchronized (this) { |
|
281 |
ensureOpen(); |
|
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
|
282 |
if (zsrc.comment == null) { |
3078 | 283 |
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
|
284 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
285 |
return zc.toString(zsrc.comment); |
3078 | 286 |
} |
287 |
} |
|
288 |
||
289 |
/** |
|
2 | 290 |
* Returns the zip file entry for the specified name, or null |
291 |
* if not found. |
|
292 |
* |
|
293 |
* @param name the name of the entry |
|
294 |
* @return the zip file entry, or null if not found |
|
295 |
* @throws IllegalStateException if the zip file has been closed |
|
296 |
*/ |
|
297 |
public ZipEntry getEntry(String name) { |
|
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
|
298 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
299 |
Objects.requireNonNull(name, "name"); |
2 | 300 |
synchronized (this) { |
301 |
ensureOpen(); |
|
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
|
302 |
int pos = zsrc.getEntryPos(zc.getBytes(name), 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
|
303 |
if (pos != -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
|
304 |
return getZipEntry(name, pos); |
2 | 305 |
} |
306 |
} |
|
307 |
return null; |
|
308 |
} |
|
309 |
||
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
|
310 |
// The outstanding inputstreams that need to be closed, |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
311 |
// mapped to the inflater objects they use. |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
312 |
private final Map<InputStream, Inflater> streams = new WeakHashMap<>(); |
2915
92e31faf9ffc
6728376: Wrong error handling in Java_java_util_zip_Deflater_deflateBytes leads to size 0 if compress fails
sherman
parents:
2704
diff
changeset
|
313 |
|
2 | 314 |
/** |
315 |
* Returns an input stream for reading the contents of the specified |
|
316 |
* 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
|
317 |
* <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
|
318 |
* 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
|
319 |
* have been returned by invocations of this method. |
2 | 320 |
* |
321 |
* @param entry the zip file entry |
|
322 |
* @return the input stream for reading the contents of the specified |
|
323 |
* zip file entry. |
|
324 |
* @throws ZipException if a ZIP format error has occurred |
|
325 |
* @throws IOException if an I/O error has occurred |
|
326 |
* @throws IllegalStateException if the zip file has been closed |
|
327 |
*/ |
|
328 |
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
|
329 |
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
|
330 |
int pos = -1; |
2 | 331 |
ZipFileInputStream in = null; |
332 |
synchronized (this) { |
|
333 |
ensureOpen(); |
|
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
334 |
if (!zc.isUTF8() && (entry.flag & EFS) != 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
|
335 |
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
|
336 |
} 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
|
337 |
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
|
338 |
} |
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
|
339 |
if (pos == -1) { |
2 | 340 |
return null; |
341 |
} |
|
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 |
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
|
343 |
switch (CENHOW(zsrc.cen, pos)) { |
7550
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
344 |
case STORED: |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
345 |
synchronized (streams) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
346 |
streams.put(in, null); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
347 |
} |
7550
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
348 |
return in; |
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
349 |
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
|
350 |
// Inflater likes a bit of slack |
7550
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
351 |
// 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
|
352 |
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
|
353 |
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
|
354 |
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
|
355 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
356 |
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
|
357 |
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
|
358 |
} |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
359 |
Inflater inf = getInflater(); |
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
|
360 |
InputStream is = new ZipFileInflaterInputStream(in, inf, (int)size); |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
361 |
synchronized (streams) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
362 |
streams.put(is, inf); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
363 |
} |
7550
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
364 |
return is; |
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
365 |
default: |
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
366 |
throw new ZipException("invalid compression method"); |
700dd1df3aa8
7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry)
sherman
parents:
6882
diff
changeset
|
367 |
} |
2 | 368 |
} |
369 |
} |
|
370 |
||
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
371 |
private class ZipFileInflaterInputStream extends InflaterInputStream { |
34774
03b4e6dc367b
8145680: Remove unnecessary explicit initialization of volatile variables in java.base
redestad
parents:
34693
diff
changeset
|
372 |
private volatile boolean closeRequested; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
373 |
private boolean eof = false; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
374 |
private final ZipFileInputStream zfin; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
375 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
376 |
ZipFileInflaterInputStream(ZipFileInputStream zfin, Inflater inf, |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
377 |
int size) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
378 |
super(zfin, inf, size); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
379 |
this.zfin = zfin; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
380 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
381 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
382 |
public void close() throws IOException { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
383 |
if (closeRequested) |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
384 |
return; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
385 |
closeRequested = true; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
386 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
387 |
super.close(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
388 |
Inflater inf; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
389 |
synchronized (streams) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
390 |
inf = streams.remove(this); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
391 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
392 |
if (inf != null) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
393 |
releaseInflater(inf); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
394 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
395 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
396 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
397 |
// Override fill() method to provide an extra "dummy" byte |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
398 |
// at the end of the input stream. This is required when |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
399 |
// using the "nowrap" Inflater option. |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
400 |
protected void fill() throws IOException { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
401 |
if (eof) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
402 |
throw new EOFException("Unexpected end of ZLIB input stream"); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
403 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
404 |
len = in.read(buf, 0, buf.length); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
405 |
if (len == -1) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
406 |
buf[0] = 0; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
407 |
len = 1; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
408 |
eof = true; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
409 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
410 |
inf.setInput(buf, 0, len); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
411 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
412 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
413 |
public int available() throws IOException { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
414 |
if (closeRequested) |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
415 |
return 0; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
416 |
long avail = zfin.size() - inf.getBytesWritten(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
417 |
return (avail > (long) Integer.MAX_VALUE ? |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
418 |
Integer.MAX_VALUE : (int) avail); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
419 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
420 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
421 |
protected void finalize() throws Throwable { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
422 |
close(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
423 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
424 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
425 |
|
2 | 426 |
/* |
427 |
* Gets an inflater from the list of available inflaters or allocates |
|
428 |
* a new one. |
|
429 |
*/ |
|
430 |
private Inflater getInflater() { |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
431 |
Inflater inf; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
432 |
synchronized (inflaterCache) { |
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
|
433 |
while ((inf = inflaterCache.poll()) != 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
|
434 |
if (!inf.ended()) { |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
435 |
return inf; |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
436 |
} |
2 | 437 |
} |
438 |
} |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
439 |
return new Inflater(true); |
2 | 440 |
} |
441 |
||
442 |
/* |
|
443 |
* Releases the specified inflater to the list of available inflaters. |
|
444 |
*/ |
|
445 |
private void releaseInflater(Inflater inf) { |
|
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
|
446 |
if (!inf.ended()) { |
1158 | 447 |
inf.reset(); |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
448 |
synchronized (inflaterCache) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
449 |
inflaterCache.add(inf); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
450 |
} |
2 | 451 |
} |
452 |
} |
|
453 |
||
454 |
// List of available Inflater objects for decompression |
|
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
|
455 |
private final Deque<Inflater> inflaterCache = new ArrayDeque<>(); |
2 | 456 |
|
457 |
/** |
|
458 |
* Returns the path name of the ZIP file. |
|
459 |
* @return the path name of the ZIP file |
|
460 |
*/ |
|
461 |
public String getName() { |
|
462 |
return name; |
|
463 |
} |
|
464 |
||
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
465 |
private class ZipEntryIterator implements Enumeration<ZipEntry>, Iterator<ZipEntry> { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
466 |
private int i = 0; |
38375 | 467 |
private final int entryCount; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
468 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
469 |
public ZipEntryIterator() { |
38375 | 470 |
synchronized (ZipFile.this) { |
471 |
ensureOpen(); |
|
472 |
this.entryCount = zsrc.total; |
|
473 |
} |
|
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
474 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
475 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
476 |
public boolean hasMoreElements() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
477 |
return hasNext(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
478 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
479 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
480 |
public boolean hasNext() { |
38375 | 481 |
return i < entryCount; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
482 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
483 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
484 |
public ZipEntry nextElement() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
485 |
return next(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
486 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
487 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
488 |
public ZipEntry next() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
489 |
synchronized (ZipFile.this) { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
490 |
ensureOpen(); |
38375 | 491 |
if (!hasNext()) { |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
492 |
throw new NoSuchElementException(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
493 |
} |
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
|
494 |
// each "entry" has 3 ints in table 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
|
495 |
return getZipEntry(null, zsrc.getEntryPos(i++ * 3)); |
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 |
} |
31469
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
498 |
|
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
499 |
public Iterator<ZipEntry> asIterator() { |
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
500 |
return this; |
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
501 |
} |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
502 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
503 |
|
2 | 504 |
/** |
505 |
* Returns an enumeration of the ZIP file entries. |
|
506 |
* @return an enumeration of the ZIP file entries |
|
507 |
* @throws IllegalStateException if the zip file has been closed |
|
508 |
*/ |
|
509 |
public Enumeration<? extends ZipEntry> entries() { |
|
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
510 |
return new ZipEntryIterator(); |
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 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
513 |
/** |
30786
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29226
diff
changeset
|
514 |
* Returns an ordered {@code Stream} over the ZIP file entries. |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
515 |
* 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
|
516 |
* the central directory of the ZIP file. |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
517 |
* |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
518 |
* @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
|
519 |
* @throws IllegalStateException if the zip file has been closed |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
520 |
* @since 1.8 |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
521 |
*/ |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
522 |
public Stream<? extends ZipEntry> stream() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
523 |
return StreamSupport.stream(Spliterators.spliterator( |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
524 |
new ZipEntryIterator(), size(), |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
9676
diff
changeset
|
525 |
Spliterator.ORDERED | Spliterator.DISTINCT | |
18822
4b6be7c19547
8019395: Consolidate StreamSupport.{stream,parallelStream} into a single method
psandoz
parents:
18253
diff
changeset
|
526 |
Spliterator.IMMUTABLE | Spliterator.NONNULL), false); |
2 | 527 |
} |
528 |
||
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
|
529 |
/* Checks ensureOpen() before invoke this 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
|
530 |
private ZipEntry getZipEntry(String name, 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
|
531 |
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
|
532 |
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
|
533 |
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
|
534 |
int clen = CENCOM(cen, pos); |
38375 | 535 |
int flag = CENFLG(cen, pos); |
536 |
if (name == null) { |
|
537 |
if (!zc.isUTF8() && (flag & EFS) != 0) { |
|
538 |
name = zc.toStringUTF8(cen, pos + CENHDR, nlen); |
|
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
539 |
} else { |
38375 | 540 |
name = zc.toString(cen, pos + CENHDR, nlen); |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
541 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
542 |
} |
38375 | 543 |
ZipEntry e = new ZipEntry(name); |
544 |
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
|
545 |
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
|
546 |
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
|
547 |
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
|
548 |
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
|
549 |
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
|
550 |
if (elen != 0) { |
38375 | 551 |
int start = pos + CENHDR + nlen; |
552 |
e.setExtra0(Arrays.copyOfRange(cen, start, start + elen), 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
|
553 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
554 |
if (clen != 0) { |
38375 | 555 |
int start = pos + CENHDR + nlen + elen; |
556 |
if (!zc.isUTF8() && (flag & EFS) != 0) { |
|
557 |
e.comment = zc.toStringUTF8(cen, start, clen); |
|
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
558 |
} else { |
38375 | 559 |
e.comment = zc.toString(cen, start, clen); |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
560 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
561 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
562 |
return e; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
563 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
564 |
|
2 | 565 |
/** |
566 |
* 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
|
567 |
* |
2 | 568 |
* @return the number of entries in the ZIP file |
569 |
* @throws IllegalStateException if the zip file has been closed |
|
570 |
*/ |
|
571 |
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
|
572 |
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
|
573 |
ensureOpen(); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
574 |
return zsrc.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
|
575 |
} |
2 | 576 |
} |
577 |
||
578 |
/** |
|
579 |
* Closes the ZIP file. |
|
580 |
* <p> Closing this ZIP file will close all of the input streams |
|
581 |
* previously returned by invocations of the {@link #getInputStream |
|
582 |
* getInputStream} method. |
|
583 |
* |
|
584 |
* @throws IOException if an I/O error has occurred |
|
585 |
*/ |
|
586 |
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
|
587 |
if (closeRequested) { |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
588 |
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
|
589 |
} |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
590 |
closeRequested = true; |
2 | 591 |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
592 |
synchronized (this) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
593 |
// Close streams, release their inflaters |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
594 |
synchronized (streams) { |
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
|
595 |
if (!streams.isEmpty()) { |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
596 |
Map<InputStream, Inflater> copy = new HashMap<>(streams); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
597 |
streams.clear(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
598 |
for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
599 |
e.getKey().close(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
600 |
Inflater inf = e.getValue(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
601 |
if (inf != null) { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
602 |
inf.end(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
603 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
604 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
605 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
606 |
} |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
607 |
// Release cached inflaters |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
608 |
synchronized (inflaterCache) { |
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
|
609 |
Inflater inf; |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
610 |
while ((inf = inflaterCache.poll()) != null) { |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
611 |
inf.end(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
612 |
} |
2915
92e31faf9ffc
6728376: Wrong error handling in Java_java_util_zip_Deflater_deflateBytes leads to size 0 if compress fails
sherman
parents:
2704
diff
changeset
|
613 |
} |
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
|
614 |
// Release zip 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
|
615 |
if (zsrc != 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
|
616 |
Source.close(zsrc); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
617 |
zsrc = null; |
2 | 618 |
} |
619 |
} |
|
620 |
} |
|
621 |
||
622 |
/** |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
623 |
* Ensures that the system resources held by this ZipFile object are |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
624 |
* released when there are no more references to it. |
2 | 625 |
* |
626 |
* <p> |
|
627 |
* Since the time when GC would invoke this method is undetermined, |
|
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
|
628 |
* it is strongly recommended that applications invoke the {@code close} |
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
|
629 |
* method as soon they have finished accessing this {@code ZipFile}. |
2 | 630 |
* This will prevent holding up system resources for an undetermined |
631 |
* length of time. |
|
632 |
* |
|
633 |
* @throws IOException if an I/O error has occurred |
|
634 |
* @see java.util.zip.ZipFile#close() |
|
635 |
*/ |
|
636 |
protected void finalize() throws IOException { |
|
637 |
close(); |
|
638 |
} |
|
639 |
||
640 |
private void ensureOpen() { |
|
641 |
if (closeRequested) { |
|
642 |
throw new IllegalStateException("zip file closed"); |
|
643 |
} |
|
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
|
644 |
if (zsrc == null) { |
2 | 645 |
throw new IllegalStateException("The object is not initialized."); |
646 |
} |
|
647 |
} |
|
648 |
||
649 |
private void ensureOpenOrZipException() throws IOException { |
|
650 |
if (closeRequested) { |
|
651 |
throw new ZipException("ZipFile closed"); |
|
652 |
} |
|
653 |
} |
|
654 |
||
655 |
/* |
|
656 |
* Inner class implementing the input stream used to read a |
|
657 |
* (possibly compressed) zip file entry. |
|
658 |
*/ |
|
659 |
private class ZipFileInputStream extends InputStream { |
|
34774
03b4e6dc367b
8145680: Remove unnecessary explicit initialization of volatile variables in java.base
redestad
parents:
34693
diff
changeset
|
660 |
private volatile boolean closeRequested; |
2 | 661 |
private long pos; // current position within entry data |
662 |
protected long rem; // number of remaining bytes within entry |
|
663 |
protected long size; // uncompressed size of this entry |
|
664 |
||
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
|
665 |
ZipFileInputStream(byte[] cen, int cenpos) 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
|
666 |
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
|
667 |
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
|
668 |
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
|
669 |
// 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
|
670 |
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
|
671 |
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
|
672 |
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
|
673 |
} |
29ea8310a27a
8145260: To bring j.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 |
// negative for lazy initialization, see getDataOffset(); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
675 |
pos = - (pos + ZipFile.this.zsrc.locpos); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
676 |
} |
29ea8310a27a
8145260: To bring j.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 |
private void checkZIP64(byte[] cen, int cenpos) 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
|
679 |
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
|
680 |
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
|
681 |
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
|
682 |
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
|
683 |
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
|
684 |
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
|
685 |
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
|
686 |
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
|
687 |
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
|
688 |
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
|
689 |
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
|
690 |
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
|
691 |
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
|
692 |
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
|
693 |
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
|
694 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
695 |
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
|
696 |
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
|
697 |
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
|
698 |
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
|
699 |
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
|
700 |
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
|
701 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
702 |
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
|
703 |
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
|
704 |
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
|
705 |
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
|
706 |
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
|
707 |
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
|
708 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
709 |
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
|
710 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
711 |
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
|
712 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
713 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
714 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
715 |
/* The Zip file spec explicitly allows the LOC extra data size to |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
716 |
* be different from the CEN extra data size. Since we cannot trust |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
717 |
* the CEN extra data size, we need to read the LOC to determine |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
718 |
* the entry data 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
|
719 |
*/ |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
720 |
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
|
721 |
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
|
722 |
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
|
723 |
pos = -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
|
724 |
int len = ZipFile.this.zsrc.readFullyAt(loc, 0, loc.length, 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
|
725 |
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
|
726 |
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
|
727 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
728 |
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
|
729 |
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
|
730 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
731 |
pos += LOCHDR + LOCNAM(loc) + LOCEXT(loc); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
732 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
733 |
return pos; |
2 | 734 |
} |
735 |
||
736 |
public int read(byte b[], int off, int len) throws IOException { |
|
737 |
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
|
738 |
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
|
739 |
initDataOffset(); |
23741
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
740 |
if (rem == 0) { |
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
741 |
return -1; |
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
742 |
} |
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
|
743 |
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
|
744 |
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
|
745 |
} |
23741
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
746 |
if (len <= 0) { |
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
747 |
return 0; |
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
748 |
} |
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
|
749 |
len = ZipFile.this.zsrc.readAt(b, off, len, pos); |
23741
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
750 |
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
|
751 |
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
|
752 |
rem -= len; |
23741
03987fb914a9
8038491: Improve synchronization in ZipFile.read()
coffeys
parents:
19374
diff
changeset
|
753 |
} |
2 | 754 |
} |
755 |
if (rem == 0) { |
|
756 |
close(); |
|
757 |
} |
|
758 |
return len; |
|
759 |
} |
|
760 |
||
761 |
public int read() throws IOException { |
|
762 |
byte[] b = new byte[1]; |
|
763 |
if (read(b, 0, 1) == 1) { |
|
764 |
return b[0] & 0xff; |
|
765 |
} else { |
|
766 |
return -1; |
|
767 |
} |
|
768 |
} |
|
769 |
||
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
|
770 |
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
|
771 |
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
|
772 |
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
|
773 |
initDataOffset(); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
774 |
if (n > 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
|
775 |
n = 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
|
776 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
777 |
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
|
778 |
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
|
779 |
} |
2 | 780 |
if (rem == 0) { |
781 |
close(); |
|
782 |
} |
|
783 |
return n; |
|
784 |
} |
|
785 |
||
786 |
public int available() { |
|
787 |
return rem > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) rem; |
|
788 |
} |
|
789 |
||
790 |
public long size() { |
|
791 |
return size; |
|
792 |
} |
|
793 |
||
794 |
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
|
795 |
if (closeRequested) { |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
796 |
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
|
797 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
798 |
closeRequested = true; |
34526
f1f852f5f477
8144958: changes by JDK-8142508 seems to have broken jtreg
sherman
parents:
34525
diff
changeset
|
799 |
rem = 0; |
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
800 |
synchronized (streams) { |
2915
92e31faf9ffc
6728376: Wrong error handling in Java_java_util_zip_Deflater_deflateBytes leads to size 0 if compress fails
sherman
parents:
2704
diff
changeset
|
801 |
streams.remove(this); |
2 | 802 |
} |
803 |
} |
|
9281
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
804 |
|
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
805 |
protected void finalize() { |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
806 |
close(); |
41e796d1b6c1
7031076: Retained ZipFile InputStreams increase heap demand
sherman
parents:
9035
diff
changeset
|
807 |
} |
2 | 808 |
} |
809 |
||
38375 | 810 |
/** |
38467
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
811 |
* Returns the names of all non-directory entries that begin with |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
812 |
* "META-INF/" (case ignored). This method is used in JarFile, via |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
813 |
* SharedSecrets, as an optimization when looking up manifest and |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
814 |
* signature file entries. Returns null if no entries were found. |
18223 | 815 |
*/ |
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
|
816 |
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
|
817 |
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
|
818 |
ensureOpen(); |
38375 | 819 |
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
|
820 |
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
|
821 |
} |
38375 | 822 |
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
|
823 |
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
|
824 |
for (int i = 0; i < names.length; i++) { |
38375 | 825 |
int pos = zsrc.metanames[i]; |
826 |
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
|
827 |
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
|
828 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
829 |
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
|
830 |
} |
18223 | 831 |
} |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
1158
diff
changeset
|
832 |
|
38466
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
833 |
private static boolean isWindows; |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
834 |
static { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
835 |
SharedSecrets.setJavaUtilZipFileAccess( |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
836 |
new JavaUtilZipFileAccess() { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
837 |
public boolean startsWithLocHeader(ZipFile zip) { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
838 |
return zip.zsrc.startsWithLoc; |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
839 |
} |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
840 |
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
|
841 |
return zip.getMetaInfEntryNames(); |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
842 |
} |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
843 |
} |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
844 |
); |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
845 |
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
|
846 |
} |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
847 |
|
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
|
848 |
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
|
849 |
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
|
850 |
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
|
851 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
852 |
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
|
853 |
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
|
854 |
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
|
855 |
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
|
856 |
// list of meta entries in META-INF dir |
38375 | 857 |
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
|
858 |
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
|
859 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
860 |
// 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
|
861 |
// |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
862 |
// 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
|
863 |
// 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
|
864 |
// 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
|
865 |
// 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
|
866 |
// |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
867 |
// 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
|
868 |
// 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
|
869 |
// 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
|
870 |
// 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
|
871 |
// } |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
872 |
// 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
|
873 |
// |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
874 |
// 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
|
875 |
// {@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
|
876 |
// 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
|
877 |
// |
29ea8310a27a
8145260: To bring j.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 |
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
|
879 |
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
|
880 |
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
|
881 |
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
|
882 |
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
|
883 |
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
|
884 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
886 |
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
|
887 |
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
|
888 |
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
|
889 |
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
|
890 |
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
|
891 |
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
|
892 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
894 |
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
|
895 |
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
|
896 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
898 |
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
|
899 |
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
|
900 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
903 |
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
|
904 |
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
|
905 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
908 |
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
|
909 |
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
|
910 |
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
|
911 |
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
|
912 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
914 |
if (fk != 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
|
915 |
return fk.equals(key.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
|
916 |
} 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
|
917 |
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
|
918 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
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 |
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
|
924 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
925 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
926 |
public static Source get(File file, 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
|
927 |
Key key = new 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
|
928 |
Files.readAttributes(file.toPath(), BasicFileAttributes.class)); |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
929 |
Source 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
|
930 |
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
|
931 |
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
|
932 |
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
|
933 |
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
|
934 |
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
|
935 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
938 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
940 |
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
|
941 |
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
|
942 |
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
|
943 |
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
|
944 |
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
|
945 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
946 |
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
|
947 |
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
|
948 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
951 |
private static void close(Source src) 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
|
952 |
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
|
953 |
if (--src.refs == 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
|
954 |
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
|
955 |
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
|
956 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
957 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
958 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
959 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
960 |
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
|
961 |
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
|
962 |
if (toDelete) { |
38466
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
963 |
if (isWindows) { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
964 |
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
|
965 |
.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
|
966 |
} else { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
967 |
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
|
968 |
key.file.delete(); |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
969 |
} |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
970 |
} else { |
4bcf5f2bb351
8147588: Jar file and Zip file not removed in spite of the OPEN_DELETE flag
sherman
parents:
38375
diff
changeset
|
971 |
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
|
972 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
973 |
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
|
974 |
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
|
975 |
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
|
976 |
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
|
977 |
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
|
978 |
} 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
|
979 |
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
|
980 |
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
|
981 |
} 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
|
982 |
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
|
983 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
984 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
985 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
986 |
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
|
987 |
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
|
988 |
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
|
989 |
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
|
990 |
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
|
991 |
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
|
992 |
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
|
993 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
994 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
995 |
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
|
996 |
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
|
997 |
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
|
998 |
{ |
29ea8310a27a
8145260: To bring j.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 |
synchronized(zfile) { |
29ea8310a27a
8145260: To bring j.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 |
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
|
1001 |
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
|
1002 |
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
|
1003 |
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
|
1004 |
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
|
1005 |
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
|
1006 |
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
|
1007 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1008 |
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
|
1009 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1010 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1011 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1012 |
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
|
1013 |
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
|
1014 |
{ |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1015 |
synchronized(zfile) { |
29ea8310a27a
8145260: To bring j.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 |
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
|
1017 |
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
|
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 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1020 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1021 |
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
|
1022 |
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
|
1023 |
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
|
1024 |
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
|
1025 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1026 |
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
|
1027 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1028 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1029 |
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
|
1030 |
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
|
1031 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1032 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1033 |
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
|
1034 |
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
|
1035 |
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
|
1036 |
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
|
1037 |
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
|
1038 |
} |
2 | 1039 |
|
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
|
1040 |
/* |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1041 |
* 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
|
1042 |
* 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
|
1043 |
* 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
|
1044 |
* 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
|
1045 |
*/ |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1046 |
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
|
1047 |
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
|
1048 |
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
|
1049 |
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
|
1050 |
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
|
1051 |
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
|
1052 |
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
|
1053 |
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
|
1054 |
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
|
1055 |
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
|
1056 |
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
|
1057 |
// 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
|
1058 |
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
|
1059 |
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
|
1060 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1061 |
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
|
1062 |
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
|
1063 |
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
|
1064 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1065 |
// 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
|
1066 |
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
|
1067 |
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
|
1068 |
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
|
1069 |
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
|
1070 |
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
|
1071 |
// 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
|
1072 |
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
|
1073 |
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
|
1074 |
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
|
1075 |
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
|
1076 |
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
|
1077 |
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
|
1078 |
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
|
1079 |
// 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
|
1080 |
// 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
|
1081 |
// 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
|
1082 |
// 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
|
1083 |
// 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
|
1084 |
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
|
1085 |
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
|
1086 |
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
|
1087 |
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
|
1088 |
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
|
1089 |
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
|
1090 |
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
|
1091 |
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
|
1092 |
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
|
1093 |
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
|
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 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1097 |
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
|
1098 |
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
|
1099 |
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
|
1100 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
if (end.cenlen == 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
|
1103 |
end.cenoff == 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
|
1104 |
end.centot == ZIP64_MAGICCOUNT) |
29ea8310a27a
8145260: To bring j.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 |
{ |
29ea8310a27a
8145260: To bring j.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 |
// need to find the zip64 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
|
1107 |
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
|
1108 |
byte[] loc64 = new byte[ZIP64_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
|
1109 |
if (readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_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
|
1110 |
!= loc64.length || GETSIG(loc64) != ZIP64_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
|
1111 |
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
|
1112 |
} |
29ea8310a27a
8145260: To bring j.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 |
long end64pos = ZIP64_LOCOFF(loc64); |
29ea8310a27a
8145260: To bring j.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 |
byte[] end64buf = new byte[ZIP64_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
|
1115 |
if (readFullyAt(end64buf, 0, end64buf.length, end64pos) |
29ea8310a27a
8145260: To bring j.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 |
!= end64buf.length || GETSIG(end64buf) != ZIP64_ENDSIG) { |
29ea8310a27a
8145260: To bring j.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 |
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
|
1118 |
} |
29ea8310a27a
8145260: To bring j.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 |
// end64 found, re-calcualte everything. |
29ea8310a27a
8145260: To bring j.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 |
end.cenlen = ZIP64_ENDSIZ(end64buf); |
29ea8310a27a
8145260: To bring j.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 |
end.cenoff = ZIP64_ENDOFF(end64buf); |
29ea8310a27a
8145260: To bring j.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 |
end.centot = (int)ZIP64_ENDTOT(end64buf); // assume total < 2g |
29ea8310a27a
8145260: To bring j.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 |
end.endpos = end64pos; |
29ea8310a27a
8145260: To bring j.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 |
} catch (IOException x) {} // no zip64 loc/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
|
1125 |
} |
29ea8310a27a
8145260: To bring j.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 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
|
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 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1131 |
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
|
1132 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
29ea8310a27a
8145260: To bring j.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 |
// 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
|
1135 |
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
|
1136 |
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
|
1137 |
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
|
1138 |
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
|
1139 |
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
|
1140 |
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
|
1141 |
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
|
1142 |
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
|
1143 |
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
|
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 |
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
|
1146 |
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
|
1147 |
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
|
1148 |
// 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
|
1149 |
// 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
|
1150 |
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
|
1151 |
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
|
1152 |
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
|
1153 |
} |
29ea8310a27a
8145260: To bring j.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 |
// 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
|
1155 |
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
|
1156 |
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
|
1157 |
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
|
1158 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1160 |
} 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
|
1161 |
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
|
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 |
// 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
|
1164 |
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
|
1165 |
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
|
1166 |
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
|
1167 |
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
|
1168 |
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
|
1169 |
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
|
1170 |
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
|
1171 |
|
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1172 |
// list for all meta entries |
38375 | 1173 |
ArrayList<Integer> metanamesList = null; |
2 | 1174 |
|
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
|
1175 |
// 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
|
1176 |
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
|
1177 |
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
|
1178 |
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
|
1179 |
int limit = cen.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
|
1180 |
while (pos + CENHDR <= 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
|
1181 |
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
|
1182 |
// 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
|
1183 |
// 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
|
1184 |
// 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
|
1185 |
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
|
1186 |
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
|
1187 |
} |
29ea8310a27a
8145260: To bring j.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 (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
|
1189 |
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
|
1190 |
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
|
1191 |
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
|
1192 |
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
|
1193 |
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
|
1194 |
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
|
1195 |
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
|
1196 |
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
|
1197 |
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
|
1198 |
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
|
1199 |
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
|
1200 |
// 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
|
1201 |
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
|
1202 |
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
|
1203 |
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
|
1204 |
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
|
1205 |
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
|
1206 |
// 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
|
1207 |
if (isMetaName(cen, pos + CENHDR, nlen)) { |
38375 | 1208 |
if (metanamesList == null) |
1209 |
metanamesList = new ArrayList<>(4); |
|
1210 |
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
|
1211 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1212 |
// 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
|
1213 |
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
|
1214 |
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
|
1215 |
} |
29ea8310a27a
8145260: To bring j.u.z.ZipFile's native implementation to Java to remove the expensive jni cost and mmap crash risk [2]
sherman
parents:
34526
diff
changeset
|
1216 |
total = i; |
38375 | 1217 |
if (metanamesList != null) { |
1218 |
metanames = new int[metanamesList.size()]; |
|
1219 |
for (int j = 0, len = metanames.length; j < len; j++) { |
|
1220 |
metanames[j] = metanamesList.get(j); |
|
1221 |
} |
|
1222 |
} |
|
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
|
1223 |
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
|
1224 |
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
|
1225 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
29ea8310a27a
8145260: To bring j.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 |
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
|
1229 |
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
|
1230 |
} |
2 | 1231 |
|
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
|
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 |
* 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
|
1234 |
* 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
|
1235 |
*/ |
29ea8310a27a
8145260: To bring j.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 |
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
|
1237 |
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
|
1238 |
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
|
1239 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1241 |
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
|
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 |
* 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
|
1244 |
* 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
|
1245 |
* 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
|
1246 |
* 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
|
1247 |
*/ |
29ea8310a27a
8145260: To bring j.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 |
while(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
|
1249 |
/* |
29ea8310a27a
8145260: To bring j.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 |
* 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
|
1251 |
* 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
|
1252 |
*/ |
29ea8310a27a
8145260: To bring j.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 |
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
|
1254 |
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
|
1255 |
// 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
|
1256 |
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
|
1257 |
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
|
1258 |
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
|
1259 |
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
|
1260 |
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
|
1261 |
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
|
1262 |
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
|
1263 |
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
|
1264 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1267 |
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
|
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 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
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
|
1272 |
} |
29ea8310a27a
8145260: To bring j.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 |
/* 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
|
1274 |
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
|
1275 |
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
|
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 |
/* 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
|
1278 |
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
|
1279 |
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
|
1280 |
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
|
1281 |
//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
|
1282 |
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
|
1283 |
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
|
1284 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
38375 | 1287 |
/** |
1288 |
* Returns true if the bytes represent a non-directory name |
|
1289 |
* 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
|
1290 |
*/ |
38375 | 1291 |
private static boolean isMetaName(byte[] name, int off, int len) { |
1292 |
// Use the "oldest ASCII trick in the book" |
|
1293 |
return len > 9 // "META-INF/".length() |
|
1294 |
&& name[off + len - 1] != '/' // non-directory |
|
1295 |
&& (name[off++] | 0x20) == 'm' |
|
1296 |
&& (name[off++] | 0x20) == 'e' |
|
1297 |
&& (name[off++] | 0x20) == 't' |
|
1298 |
&& (name[off++] | 0x20) == 'a' |
|
1299 |
&& (name[off++] ) == '-' |
|
1300 |
&& (name[off++] | 0x20) == 'i' |
|
1301 |
&& (name[off++] | 0x20) == 'n' |
|
1302 |
&& (name[off++] | 0x20) == 'f' |
|
1303 |
&& (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
|
1304 |
} |
29ea8310a27a
8145260: To bring j.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 |
|
38467
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1306 |
/** |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1307 |
* Returns the number of CEN headers in a central directory. |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1308 |
* Will not throw, even if the zip file is corrupt. |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1309 |
* |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1310 |
* @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
|
1311 |
* @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
|
1312 |
*/ |
38467
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1313 |
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
|
1314 |
int count = 0; |
38467
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1315 |
for (int p = 0; |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1316 |
p + CENHDR <= size; |
172e0c9007a6
8157613: Internal documentation improvements to ZipFile.java
martin
parents:
38466
diff
changeset
|
1317 |
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
|
1318 |
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
|
1319 |
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
|
1320 |
} |
29ea8310a27a
8145260: To bring j.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 |
} |
2 | 1322 |
} |