author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 44534 | jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java@a076dffbc2c1 |
child 47223 | 723486922bfe |
permissions | -rw-r--r-- |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1 |
/* |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2 |
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
4 |
* |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
10 |
* |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
15 |
* accompanied this code). |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
16 |
* |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
20 |
* |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
23 |
* questions. |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
24 |
*/ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
25 |
|
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
26 |
package jdk.nio.zipfs; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
27 |
|
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
28 |
import java.io.BufferedOutputStream; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
29 |
import java.io.ByteArrayInputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
30 |
import java.io.ByteArrayOutputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
31 |
import java.io.EOFException; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
32 |
import java.io.File; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
33 |
import java.io.IOException; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
34 |
import java.io.InputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
35 |
import java.io.OutputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
36 |
import java.nio.ByteBuffer; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
37 |
import java.nio.MappedByteBuffer; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
38 |
import java.nio.channels.*; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
39 |
import java.nio.file.*; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
40 |
import java.nio.file.attribute.*; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
41 |
import java.nio.file.spi.*; |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
42 |
import java.security.AccessController; |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
43 |
import java.security.PrivilegedAction; |
24364
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
44 |
import java.security.PrivilegedActionException; |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
45 |
import java.security.PrivilegedExceptionAction; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
46 |
import java.util.*; |
7189 | 47 |
import java.util.concurrent.locks.ReadWriteLock; |
48 |
import java.util.concurrent.locks.ReentrantReadWriteLock; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
49 |
import java.util.regex.Pattern; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
50 |
import java.util.zip.CRC32; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
51 |
import java.util.zip.Inflater; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
52 |
import java.util.zip.Deflater; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
53 |
import java.util.zip.InflaterInputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
54 |
import java.util.zip.DeflaterOutputStream; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
55 |
import java.util.zip.ZipException; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
56 |
import static java.lang.Boolean.*; |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
57 |
import static jdk.nio.zipfs.ZipConstants.*; |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
58 |
import static jdk.nio.zipfs.ZipUtils.*; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
59 |
import static java.nio.file.StandardOpenOption.*; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
60 |
import static java.nio.file.StandardCopyOption.*; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
61 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
62 |
/** |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
63 |
* A FileSystem built on a zip file |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
64 |
* |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
65 |
* @author Xueming Shen |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
66 |
*/ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
67 |
|
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
68 |
class ZipFileSystem extends FileSystem { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
69 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
70 |
private final ZipFileSystemProvider provider; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
71 |
private final Path zfpath; |
38769
8046caf79f1c
8061777: (zipfs) IllegalArgumentException in ZipCoder.toString when using Shitft_JIS
sherman
parents:
37803
diff
changeset
|
72 |
final ZipCoder zc; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
73 |
private final boolean noExtt; // see readExtra() |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
74 |
private final ZipPath rootdir; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
75 |
// configurable by env map |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
76 |
private final boolean useTempFile; // use a temp file for newOS, default |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
77 |
// is to use BAOS for better performance |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
78 |
private boolean readOnly = false; // readonly file system |
23925
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
79 |
private static final boolean isWindows = AccessController.doPrivileged( |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
80 |
(PrivilegedAction<Boolean>) () -> System.getProperty("os.name") |
0d5f2d863262
8038500: (zipfs) Upgrade ZIP provider to be a supported provider
sherman
parents:
23010
diff
changeset
|
81 |
.startsWith("Windows")); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
82 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
83 |
ZipFileSystem(ZipFileSystemProvider provider, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
84 |
Path zfpath, |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
85 |
Map<String, ?> env) throws IOException |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
86 |
{ |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
87 |
// create a new zip if not exists |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
88 |
boolean createNew = "true".equals(env.get("create")); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
89 |
// default encoding for name/comment |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
90 |
String nameEncoding = env.containsKey("encoding") ? |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
91 |
(String)env.get("encoding") : "UTF-8"; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
92 |
this.noExtt = "false".equals(env.get("zipinfo-time")); |
7189 | 93 |
this.useTempFile = TRUE.equals(env.get("useTempFile")); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
94 |
this.provider = provider; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
95 |
this.zfpath = zfpath; |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
96 |
if (Files.notExists(zfpath)) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
97 |
if (createNew) { |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
98 |
try (OutputStream os = Files.newOutputStream(zfpath, CREATE_NEW, WRITE)) { |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
99 |
new END().write(os, 0); |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
100 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
101 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
102 |
throw new FileSystemNotFoundException(zfpath.toString()); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
103 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
104 |
} |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
105 |
// sm and existence check |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
106 |
zfpath.getFileSystem().provider().checkAccess(zfpath, AccessMode.READ); |
24364
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
107 |
boolean writeable = AccessController.doPrivileged( |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
108 |
(PrivilegedAction<Boolean>) () -> Files.isWritable(zfpath)); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
109 |
this.readOnly = !writeable; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
110 |
this.zc = ZipCoder.get(nameEncoding); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
111 |
this.rootdir = new ZipPath(this, new byte[]{'/'}); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
112 |
this.ch = Files.newByteChannel(zfpath, READ); |
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
113 |
try { |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
114 |
this.cen = initCEN(); |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
115 |
} catch (IOException x) { |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
116 |
try { |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
117 |
this.ch.close(); |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
118 |
} catch (IOException xx) { |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
119 |
x.addSuppressed(xx); |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
120 |
} |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
121 |
throw x; |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
122 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
123 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
124 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
125 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
126 |
public FileSystemProvider provider() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
127 |
return provider; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
128 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
129 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
130 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
131 |
public String getSeparator() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
132 |
return "/"; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
133 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
134 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
135 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
136 |
public boolean isOpen() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
137 |
return isOpen; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
138 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
139 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
140 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
141 |
public boolean isReadOnly() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
142 |
return readOnly; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
143 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
144 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
145 |
private void checkWritable() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
146 |
if (readOnly) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
147 |
throw new ReadOnlyFileSystemException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
148 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
149 |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
150 |
void setReadOnly() { |
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
151 |
this.readOnly = true; |
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
152 |
} |
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
153 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
154 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
155 |
public Iterable<Path> getRootDirectories() { |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
156 |
return List.of(rootdir); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
157 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
158 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
159 |
ZipPath getRootDir() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
160 |
return rootdir; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
161 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
162 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
163 |
@Override |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
164 |
public ZipPath getPath(String first, String... more) { |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
165 |
if (more.length == 0) { |
38769
8046caf79f1c
8061777: (zipfs) IllegalArgumentException in ZipCoder.toString when using Shitft_JIS
sherman
parents:
37803
diff
changeset
|
166 |
return new ZipPath(this, first); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
167 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
168 |
StringBuilder sb = new StringBuilder(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
169 |
sb.append(first); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
170 |
for (String path : more) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
171 |
if (path.length() > 0) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
172 |
if (sb.length() > 0) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
173 |
sb.append('/'); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
174 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
175 |
sb.append(path); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
176 |
} |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
177 |
} |
38769
8046caf79f1c
8061777: (zipfs) IllegalArgumentException in ZipCoder.toString when using Shitft_JIS
sherman
parents:
37803
diff
changeset
|
178 |
return new ZipPath(this, sb.toString()); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
179 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
180 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
181 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
182 |
public UserPrincipalLookupService getUserPrincipalLookupService() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
183 |
throw new UnsupportedOperationException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
184 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
185 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
186 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
187 |
public WatchService newWatchService() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
188 |
throw new UnsupportedOperationException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
189 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
190 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
191 |
FileStore getFileStore(ZipPath path) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
192 |
return new ZipFileStore(path); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
193 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
194 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
195 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
196 |
public Iterable<FileStore> getFileStores() { |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
197 |
return List.of(new ZipFileStore(rootdir)); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
198 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
199 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
200 |
private static final Set<String> supportedFileAttributeViews = |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
201 |
Set.of("basic", "zip"); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
202 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
203 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
204 |
public Set<String> supportedFileAttributeViews() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
205 |
return supportedFileAttributeViews; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
206 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
207 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
208 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
209 |
public String toString() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
210 |
return zfpath.toString(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
211 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
212 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
213 |
Path getZipFile() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
214 |
return zfpath; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
215 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
216 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
217 |
private static final String GLOB_SYNTAX = "glob"; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
218 |
private static final String REGEX_SYNTAX = "regex"; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
219 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
220 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
221 |
public PathMatcher getPathMatcher(String syntaxAndInput) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
222 |
int pos = syntaxAndInput.indexOf(':'); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
223 |
if (pos <= 0 || pos == syntaxAndInput.length()) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
224 |
throw new IllegalArgumentException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
225 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
226 |
String syntax = syntaxAndInput.substring(0, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
227 |
String input = syntaxAndInput.substring(pos + 1); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
228 |
String expr; |
29270
0f65e3c44659
8073445: (fs) FileSystem.getPathMatcher(...) should check syntax component without regard to case
bpb
parents:
28562
diff
changeset
|
229 |
if (syntax.equalsIgnoreCase(GLOB_SYNTAX)) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
230 |
expr = toRegexPattern(input); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
231 |
} else { |
29270
0f65e3c44659
8073445: (fs) FileSystem.getPathMatcher(...) should check syntax component without regard to case
bpb
parents:
28562
diff
changeset
|
232 |
if (syntax.equalsIgnoreCase(REGEX_SYNTAX)) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
233 |
expr = input; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
234 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
235 |
throw new UnsupportedOperationException("Syntax '" + syntax + |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
236 |
"' not recognized"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
237 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
238 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
239 |
// return matcher |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
240 |
final Pattern pattern = Pattern.compile(expr); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
241 |
return new PathMatcher() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
242 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
243 |
public boolean matches(Path path) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
244 |
return pattern.matcher(path.toString()).matches(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
245 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
246 |
}; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
247 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
248 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
249 |
@Override |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
250 |
public void close() throws IOException { |
7189 | 251 |
beginWrite(); |
252 |
try { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
253 |
if (!isOpen) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
254 |
return; |
7189 | 255 |
isOpen = false; // set closed |
256 |
} finally { |
|
257 |
endWrite(); |
|
258 |
} |
|
259 |
if (!streams.isEmpty()) { // unlock and close all remaining streams |
|
260 |
Set<InputStream> copy = new HashSet<>(streams); |
|
261 |
for (InputStream is: copy) |
|
262 |
is.close(); |
|
263 |
} |
|
264 |
beginWrite(); // lock and sync |
|
265 |
try { |
|
24364
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
266 |
AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> { |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
267 |
sync(); return null; |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
268 |
}); |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
269 |
ch.close(); // close the ch just in case no update |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
270 |
} catch (PrivilegedActionException e) { // and sync dose not close the ch |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
271 |
throw (IOException)e.getException(); |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
272 |
} finally { |
7189 | 273 |
endWrite(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
274 |
} |
7189 | 275 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
276 |
synchronized (inflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
277 |
for (Inflater inf : inflaters) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
278 |
inf.end(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
279 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
280 |
synchronized (deflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
281 |
for (Deflater def : deflaters) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
282 |
def.end(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
283 |
} |
7189 | 284 |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
285 |
IOException ioe = null; |
7189 | 286 |
synchronized (tmppaths) { |
287 |
for (Path p: tmppaths) { |
|
288 |
try { |
|
24364
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
289 |
AccessController.doPrivileged( |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
290 |
(PrivilegedExceptionAction<Boolean>)() -> Files.deleteIfExists(p)); |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
291 |
} catch (PrivilegedActionException e) { |
da8afb112f5d
8040059: Change default policy for extensions to no permission
mchung
parents:
23925
diff
changeset
|
292 |
IOException x = (IOException)e.getException(); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
293 |
if (ioe == null) |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
294 |
ioe = x; |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
295 |
else |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
296 |
ioe.addSuppressed(x); |
7189 | 297 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
298 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
299 |
} |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
300 |
provider.removeFileSystem(zfpath, this); |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
301 |
if (ioe != null) |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
302 |
throw ioe; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
303 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
304 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
305 |
ZipFileAttributes getFileAttributes(byte[] path) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
306 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
307 |
{ |
7189 | 308 |
Entry e; |
309 |
beginRead(); |
|
310 |
try { |
|
311 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
312 |
e = getEntry(path); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
313 |
if (e == null) { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
314 |
IndexNode inode = getInode(path); |
7189 | 315 |
if (inode == null) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
316 |
return null; |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
317 |
e = new Entry(inode.name, inode.isdir); // pseudo directory |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
318 |
e.method = METHOD_STORED; // STORED for dir |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
319 |
e.mtime = e.atime = e.ctime = zfsDefaultTimeStamp; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
320 |
} |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
321 |
} finally { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
322 |
endRead(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
323 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
324 |
return e; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
325 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
326 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
327 |
void checkAccess(byte[] path) throws IOException { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
328 |
beginRead(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
329 |
try { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
330 |
ensureOpen(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
331 |
// is it necessary to readCEN as a sanity check? |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
332 |
if (getInode(path) == null) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
333 |
throw new NoSuchFileException(toString()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
334 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
335 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
336 |
} finally { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
337 |
endRead(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
338 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
339 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
340 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
341 |
void setTimes(byte[] path, FileTime mtime, FileTime atime, FileTime ctime) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
342 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
343 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
344 |
checkWritable(); |
7189 | 345 |
beginWrite(); |
346 |
try { |
|
347 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
348 |
Entry e = getEntry(path); // ensureOpen checked |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
349 |
if (e == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
350 |
throw new NoSuchFileException(getString(path)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
351 |
if (e.type == Entry.CEN) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
352 |
e.type = Entry.COPY; // copy e |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
353 |
if (mtime != null) |
7189 | 354 |
e.mtime = mtime.toMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
355 |
if (atime != null) |
7189 | 356 |
e.atime = atime.toMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
357 |
if (ctime != null) |
7189 | 358 |
e.ctime = ctime.toMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
359 |
update(e); |
7189 | 360 |
} finally { |
361 |
endWrite(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
362 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
363 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
364 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
365 |
boolean exists(byte[] path) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
366 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
367 |
{ |
7189 | 368 |
beginRead(); |
369 |
try { |
|
370 |
ensureOpen(); |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
371 |
return getInode(path) != null; |
7189 | 372 |
} finally { |
373 |
endRead(); |
|
374 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
375 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
376 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
377 |
boolean isDirectory(byte[] path) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
378 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
379 |
{ |
7189 | 380 |
beginRead(); |
381 |
try { |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
382 |
IndexNode n = getInode(path); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
383 |
return n != null && n.isDir(); |
7189 | 384 |
} finally { |
385 |
endRead(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
386 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
387 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
388 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
389 |
// returns the list of child paths of "path" |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
390 |
Iterator<Path> iteratorOf(byte[] path, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
391 |
DirectoryStream.Filter<? super Path> filter) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
392 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
393 |
{ |
7189 | 394 |
beginWrite(); // iteration of inodes needs exclusive lock |
395 |
try { |
|
396 |
ensureOpen(); |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
397 |
IndexNode inode = getInode(path); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
398 |
if (inode == null) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
399 |
throw new NotDirectoryException(getString(path)); |
7189 | 400 |
List<Path> list = new ArrayList<>(); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
401 |
IndexNode child = inode.child; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
402 |
while (child != null) { |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
403 |
// assume all path from zip file itself is "normalized" |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
404 |
ZipPath zp = new ZipPath(this, child.name, true); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
405 |
if (filter == null || filter.accept(zp)) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
406 |
list.add(zp); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
407 |
child = child.sibling; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
408 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
409 |
return list.iterator(); |
7189 | 410 |
} finally { |
411 |
endWrite(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
412 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
413 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
414 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
415 |
void createDirectory(byte[] dir, FileAttribute<?>... attrs) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
416 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
417 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
418 |
checkWritable(); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
419 |
// dir = toDirectoryPath(dir); |
7189 | 420 |
beginWrite(); |
421 |
try { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
422 |
ensureOpen(); |
7189 | 423 |
if (dir.length == 0 || exists(dir)) // root dir, or exiting dir |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
424 |
throw new FileAlreadyExistsException(getString(dir)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
425 |
checkParents(dir); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
426 |
Entry e = new Entry(dir, Entry.NEW, true); |
7189 | 427 |
e.method = METHOD_STORED; // STORED for dir |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
428 |
update(e); |
7189 | 429 |
} finally { |
430 |
endWrite(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
431 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
432 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
433 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
434 |
void copyFile(boolean deletesrc, byte[]src, byte[] dst, CopyOption... options) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
435 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
436 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
437 |
checkWritable(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
438 |
if (Arrays.equals(src, dst)) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
439 |
return; // do nothing, src and dst are the same |
7189 | 440 |
|
441 |
beginWrite(); |
|
442 |
try { |
|
443 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
444 |
Entry eSrc = getEntry(src); // ensureOpen checked |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
445 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
446 |
if (eSrc == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
447 |
throw new NoSuchFileException(getString(src)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
448 |
if (eSrc.isDir()) { // spec says to create dst dir |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
449 |
createDirectory(dst); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
450 |
return; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
451 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
452 |
boolean hasReplace = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
453 |
boolean hasCopyAttrs = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
454 |
for (CopyOption opt : options) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
455 |
if (opt == REPLACE_EXISTING) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
456 |
hasReplace = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
457 |
else if (opt == COPY_ATTRIBUTES) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
458 |
hasCopyAttrs = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
459 |
} |
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
460 |
Entry eDst = getEntry(dst); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
461 |
if (eDst != null) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
462 |
if (!hasReplace) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
463 |
throw new FileAlreadyExistsException(getString(dst)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
464 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
465 |
checkParents(dst); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
466 |
} |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
467 |
Entry u = new Entry(eSrc, Entry.COPY); // copy eSrc entry |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
468 |
u.name(dst); // change name |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
469 |
if (eSrc.type == Entry.NEW || eSrc.type == Entry.FILECH) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
470 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
471 |
u.type = eSrc.type; // make it the same type |
16857
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
472 |
if (deletesrc) { // if it's a "rename", take the data |
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
473 |
u.bytes = eSrc.bytes; |
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
474 |
u.file = eSrc.file; |
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
475 |
} else { // if it's not "rename", copy the data |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
476 |
if (eSrc.bytes != null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
477 |
u.bytes = Arrays.copyOf(eSrc.bytes, eSrc.bytes.length); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
478 |
else if (eSrc.file != null) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
479 |
u.file = getTempPathForEntry(null); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
480 |
Files.copy(eSrc.file, u.file, REPLACE_EXISTING); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
481 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
482 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
483 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
484 |
if (!hasCopyAttrs) |
7189 | 485 |
u.mtime = u.atime= u.ctime = System.currentTimeMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
486 |
update(u); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
487 |
if (deletesrc) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
488 |
updateDelete(eSrc); |
7189 | 489 |
} finally { |
490 |
endWrite(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
491 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
492 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
493 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
494 |
// Returns an output stream for writing the contents into the specified |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
495 |
// entry. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
496 |
OutputStream newOutputStream(byte[] path, OpenOption... options) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
497 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
498 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
499 |
checkWritable(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
500 |
boolean hasCreateNew = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
501 |
boolean hasCreate = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
502 |
boolean hasAppend = false; |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
503 |
boolean hasTruncate = false; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
504 |
for (OpenOption opt: options) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
505 |
if (opt == READ) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
506 |
throw new IllegalArgumentException("READ not allowed"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
507 |
if (opt == CREATE_NEW) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
508 |
hasCreateNew = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
509 |
if (opt == CREATE) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
510 |
hasCreate = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
511 |
if (opt == APPEND) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
512 |
hasAppend = true; |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
513 |
if (opt == TRUNCATE_EXISTING) |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
514 |
hasTruncate = true; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
515 |
} |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
516 |
if (hasAppend && hasTruncate) |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
517 |
throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed"); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
518 |
beginRead(); // only need a readlock, the "update()" will |
7189 | 519 |
try { // try to obtain a writelock when the os is |
520 |
ensureOpen(); // being closed. |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
521 |
Entry e = getEntry(path); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
522 |
if (e != null) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
523 |
if (e.isDir() || hasCreateNew) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
524 |
throw new FileAlreadyExistsException(getString(path)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
525 |
if (hasAppend) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
526 |
InputStream is = getInputStream(e); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
527 |
OutputStream os = getOutputStream(new Entry(e, Entry.NEW)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
528 |
copyStream(is, os); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
529 |
is.close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
530 |
return os; |
7189 | 531 |
} |
532 |
return getOutputStream(new Entry(e, Entry.NEW)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
533 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
534 |
if (!hasCreate && !hasCreateNew) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
535 |
throw new NoSuchFileException(getString(path)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
536 |
checkParents(path); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
537 |
return getOutputStream(new Entry(path, Entry.NEW, false)); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
538 |
} |
7189 | 539 |
} finally { |
540 |
endRead(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
541 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
542 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
543 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
544 |
// Returns an input stream for reading the contents of the specified |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
545 |
// file entry. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
546 |
InputStream newInputStream(byte[] path) throws IOException { |
7189 | 547 |
beginRead(); |
548 |
try { |
|
549 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
550 |
Entry e = getEntry(path); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
551 |
if (e == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
552 |
throw new NoSuchFileException(getString(path)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
553 |
if (e.isDir()) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
554 |
throw new FileSystemException(getString(path), "is a directory", null); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
555 |
return getInputStream(e); |
7189 | 556 |
} finally { |
557 |
endRead(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
558 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
559 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
560 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
561 |
private void checkOptions(Set<? extends OpenOption> options) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
562 |
// check for options of null type and option is an intance of StandardOpenOption |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
563 |
for (OpenOption option : options) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
564 |
if (option == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
565 |
throw new NullPointerException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
566 |
if (!(option instanceof StandardOpenOption)) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
567 |
throw new IllegalArgumentException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
568 |
} |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
569 |
if (options.contains(APPEND) && options.contains(TRUNCATE_EXISTING)) |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
570 |
throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed"); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
571 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
572 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
573 |
// Returns a Writable/ReadByteChannel for now. Might consdier to use |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
574 |
// newFileChannel() instead, which dump the entry data into a regular |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
575 |
// file on the default file system and create a FileChannel on top of |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
576 |
// it. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
577 |
SeekableByteChannel newByteChannel(byte[] path, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
578 |
Set<? extends OpenOption> options, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
579 |
FileAttribute<?>... attrs) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
580 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
581 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
582 |
checkOptions(options); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
583 |
if (options.contains(StandardOpenOption.WRITE) || |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
584 |
options.contains(StandardOpenOption.APPEND)) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
585 |
checkWritable(); |
7189 | 586 |
beginRead(); |
587 |
try { |
|
588 |
final WritableByteChannel wbc = Channels.newChannel( |
|
589 |
newOutputStream(path, options.toArray(new OpenOption[0]))); |
|
590 |
long leftover = 0; |
|
591 |
if (options.contains(StandardOpenOption.APPEND)) { |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
592 |
Entry e = getEntry(path); |
7189 | 593 |
if (e != null && e.size >= 0) |
594 |
leftover = e.size; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
595 |
} |
7189 | 596 |
final long offset = leftover; |
597 |
return new SeekableByteChannel() { |
|
598 |
long written = offset; |
|
599 |
public boolean isOpen() { |
|
600 |
return wbc.isOpen(); |
|
601 |
} |
|
602 |
||
603 |
public long position() throws IOException { |
|
604 |
return written; |
|
605 |
} |
|
606 |
||
607 |
public SeekableByteChannel position(long pos) |
|
608 |
throws IOException |
|
609 |
{ |
|
610 |
throw new UnsupportedOperationException(); |
|
611 |
} |
|
612 |
||
613 |
public int read(ByteBuffer dst) throws IOException { |
|
614 |
throw new UnsupportedOperationException(); |
|
615 |
} |
|
616 |
||
617 |
public SeekableByteChannel truncate(long size) |
|
618 |
throws IOException |
|
619 |
{ |
|
620 |
throw new UnsupportedOperationException(); |
|
621 |
} |
|
622 |
||
623 |
public int write(ByteBuffer src) throws IOException { |
|
624 |
int n = wbc.write(src); |
|
625 |
written += n; |
|
626 |
return n; |
|
627 |
} |
|
628 |
||
629 |
public long size() throws IOException { |
|
630 |
return written; |
|
631 |
} |
|
632 |
||
633 |
public void close() throws IOException { |
|
634 |
wbc.close(); |
|
635 |
} |
|
636 |
}; |
|
637 |
} finally { |
|
638 |
endRead(); |
|
639 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
640 |
} else { |
7189 | 641 |
beginRead(); |
642 |
try { |
|
643 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
644 |
Entry e = getEntry(path); |
7189 | 645 |
if (e == null || e.isDir()) |
646 |
throw new NoSuchFileException(getString(path)); |
|
647 |
final ReadableByteChannel rbc = |
|
648 |
Channels.newChannel(getInputStream(e)); |
|
649 |
final long size = e.size; |
|
650 |
return new SeekableByteChannel() { |
|
651 |
long read = 0; |
|
652 |
public boolean isOpen() { |
|
653 |
return rbc.isOpen(); |
|
654 |
} |
|
655 |
||
656 |
public long position() throws IOException { |
|
657 |
return read; |
|
658 |
} |
|
659 |
||
660 |
public SeekableByteChannel position(long pos) |
|
661 |
throws IOException |
|
662 |
{ |
|
663 |
throw new UnsupportedOperationException(); |
|
664 |
} |
|
665 |
||
666 |
public int read(ByteBuffer dst) throws IOException { |
|
12676
3b7fae360d04
7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
sherman
parents:
11841
diff
changeset
|
667 |
int n = rbc.read(dst); |
3b7fae360d04
7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
sherman
parents:
11841
diff
changeset
|
668 |
if (n > 0) { |
3b7fae360d04
7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
sherman
parents:
11841
diff
changeset
|
669 |
read += n; |
3b7fae360d04
7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
sherman
parents:
11841
diff
changeset
|
670 |
} |
3b7fae360d04
7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0
sherman
parents:
11841
diff
changeset
|
671 |
return n; |
7189 | 672 |
} |
673 |
||
674 |
public SeekableByteChannel truncate(long size) |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
675 |
throws IOException |
7189 | 676 |
{ |
677 |
throw new NonWritableChannelException(); |
|
678 |
} |
|
679 |
||
680 |
public int write (ByteBuffer src) throws IOException { |
|
681 |
throw new NonWritableChannelException(); |
|
682 |
} |
|
683 |
||
684 |
public long size() throws IOException { |
|
685 |
return size; |
|
686 |
} |
|
687 |
||
688 |
public void close() throws IOException { |
|
689 |
rbc.close(); |
|
690 |
} |
|
691 |
}; |
|
692 |
} finally { |
|
693 |
endRead(); |
|
694 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
695 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
696 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
697 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
698 |
// Returns a FileChannel of the specified entry. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
699 |
// |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
700 |
// This implementation creates a temporary file on the default file system, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
701 |
// copy the entry data into it if the entry exists, and then create a |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
702 |
// FileChannel on top of it. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
703 |
FileChannel newFileChannel(byte[] path, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
704 |
Set<? extends OpenOption> options, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
705 |
FileAttribute<?>... attrs) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
706 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
707 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
708 |
checkOptions(options); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
709 |
final boolean forWrite = (options.contains(StandardOpenOption.WRITE) || |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
710 |
options.contains(StandardOpenOption.APPEND)); |
7189 | 711 |
beginRead(); |
712 |
try { |
|
713 |
ensureOpen(); |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
714 |
Entry e = getEntry(path); |
7189 | 715 |
if (forWrite) { |
716 |
checkWritable(); |
|
717 |
if (e == null) { |
|
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
718 |
if (!options.contains(StandardOpenOption.CREATE) && |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
719 |
!options.contains(StandardOpenOption.CREATE_NEW)) { |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
720 |
throw new NoSuchFileException(getString(path)); |
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
721 |
} |
7189 | 722 |
} else { |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
723 |
if (options.contains(StandardOpenOption.CREATE_NEW)) { |
7189 | 724 |
throw new FileAlreadyExistsException(getString(path)); |
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
725 |
} |
7189 | 726 |
if (e.isDir()) |
727 |
throw new FileAlreadyExistsException("directory <" |
|
728 |
+ getString(path) + "> exists"); |
|
729 |
} |
|
30811
58432ddf9528
8028480: (zipfs) NoSuchFileException on creating a file in ZipFileSystem with CREATE and WRITE
sherman
parents:
29815
diff
changeset
|
730 |
options = new HashSet<>(options); |
7189 | 731 |
options.remove(StandardOpenOption.CREATE_NEW); // for tmpfile |
732 |
} else if (e == null || e.isDir()) { |
|
733 |
throw new NoSuchFileException(getString(path)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
734 |
} |
7189 | 735 |
|
736 |
final boolean isFCH = (e != null && e.type == Entry.FILECH); |
|
737 |
final Path tmpfile = isFCH ? e.file : getTempPathForEntry(path); |
|
738 |
final FileChannel fch = tmpfile.getFileSystem() |
|
739 |
.provider() |
|
740 |
.newFileChannel(tmpfile, options, attrs); |
|
741 |
final Entry u = isFCH ? e : new Entry(path, tmpfile, Entry.FILECH); |
|
742 |
if (forWrite) { |
|
743 |
u.flag = FLAG_DATADESCR; |
|
744 |
u.method = METHOD_DEFLATED; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
745 |
} |
7189 | 746 |
// is there a better way to hook into the FileChannel's close method? |
747 |
return new FileChannel() { |
|
748 |
public int write(ByteBuffer src) throws IOException { |
|
749 |
return fch.write(src); |
|
750 |
} |
|
751 |
public long write(ByteBuffer[] srcs, int offset, int length) |
|
752 |
throws IOException |
|
753 |
{ |
|
754 |
return fch.write(srcs, offset, length); |
|
755 |
} |
|
756 |
public long position() throws IOException { |
|
757 |
return fch.position(); |
|
758 |
} |
|
759 |
public FileChannel position(long newPosition) |
|
760 |
throws IOException |
|
761 |
{ |
|
762 |
fch.position(newPosition); |
|
763 |
return this; |
|
764 |
} |
|
765 |
public long size() throws IOException { |
|
766 |
return fch.size(); |
|
767 |
} |
|
768 |
public FileChannel truncate(long size) |
|
769 |
throws IOException |
|
770 |
{ |
|
771 |
fch.truncate(size); |
|
772 |
return this; |
|
773 |
} |
|
774 |
public void force(boolean metaData) |
|
775 |
throws IOException |
|
776 |
{ |
|
777 |
fch.force(metaData); |
|
778 |
} |
|
779 |
public long transferTo(long position, long count, |
|
780 |
WritableByteChannel target) |
|
781 |
throws IOException |
|
782 |
{ |
|
783 |
return fch.transferTo(position, count, target); |
|
784 |
} |
|
785 |
public long transferFrom(ReadableByteChannel src, |
|
786 |
long position, long count) |
|
787 |
throws IOException |
|
788 |
{ |
|
789 |
return fch.transferFrom(src, position, count); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
790 |
} |
7189 | 791 |
public int read(ByteBuffer dst) throws IOException { |
792 |
return fch.read(dst); |
|
793 |
} |
|
794 |
public int read(ByteBuffer dst, long position) |
|
795 |
throws IOException |
|
796 |
{ |
|
797 |
return fch.read(dst, position); |
|
798 |
} |
|
799 |
public long read(ByteBuffer[] dsts, int offset, int length) |
|
800 |
throws IOException |
|
801 |
{ |
|
802 |
return fch.read(dsts, offset, length); |
|
803 |
} |
|
804 |
public int write(ByteBuffer src, long position) |
|
805 |
throws IOException |
|
806 |
{ |
|
807 |
return fch.write(src, position); |
|
808 |
} |
|
809 |
public MappedByteBuffer map(MapMode mode, |
|
810 |
long position, long size) |
|
811 |
throws IOException |
|
812 |
{ |
|
813 |
throw new UnsupportedOperationException(); |
|
814 |
} |
|
815 |
public FileLock lock(long position, long size, boolean shared) |
|
816 |
throws IOException |
|
817 |
{ |
|
818 |
return fch.lock(position, size, shared); |
|
819 |
} |
|
820 |
public FileLock tryLock(long position, long size, boolean shared) |
|
821 |
throws IOException |
|
822 |
{ |
|
823 |
return fch.tryLock(position, size, shared); |
|
824 |
} |
|
825 |
protected void implCloseChannel() throws IOException { |
|
826 |
fch.close(); |
|
827 |
if (forWrite) { |
|
828 |
u.mtime = System.currentTimeMillis(); |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
829 |
u.size = Files.size(u.file); |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
830 |
|
7189 | 831 |
update(u); |
832 |
} else { |
|
833 |
if (!isFCH) // if this is a new fch for reading |
|
834 |
removeTempPathForEntry(tmpfile); |
|
835 |
} |
|
836 |
} |
|
837 |
}; |
|
838 |
} finally { |
|
839 |
endRead(); |
|
840 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
841 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
842 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
843 |
// the outstanding input streams that need to be closed |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
844 |
private Set<InputStream> streams = |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
845 |
Collections.synchronizedSet(new HashSet<InputStream>()); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
846 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
847 |
// the ex-channel and ex-path that need to close when their outstanding |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
848 |
// input streams are all closed by the obtainers. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
849 |
private Set<ExChannelCloser> exChClosers = new HashSet<>(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
850 |
|
7189 | 851 |
private Set<Path> tmppaths = Collections.synchronizedSet(new HashSet<Path>()); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
852 |
private Path getTempPathForEntry(byte[] path) throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
853 |
Path tmpPath = createTempFileInSameDirectoryAs(zfpath); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
854 |
if (path != null) { |
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
855 |
Entry e = getEntry(path); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
856 |
if (e != null) { |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
857 |
try (InputStream is = newInputStream(path)) { |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
858 |
Files.copy(is, tmpPath, REPLACE_EXISTING); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
859 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
860 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
861 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
862 |
return tmpPath; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
863 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
864 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
865 |
private void removeTempPathForEntry(Path path) throws IOException { |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
866 |
Files.delete(path); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
867 |
tmppaths.remove(path); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
868 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
869 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
870 |
// check if all parents really exit. ZIP spec does not require |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
871 |
// the existence of any "parent directory". |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
872 |
private void checkParents(byte[] path) throws IOException { |
7189 | 873 |
beginRead(); |
874 |
try { |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
875 |
while ((path = getParent(path)) != null && |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
876 |
path != ROOTPATH) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
877 |
if (!inodes.containsKey(IndexNode.keyOf(path))) { |
7189 | 878 |
throw new NoSuchFileException(getString(path)); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
879 |
} |
7189 | 880 |
} |
881 |
} finally { |
|
882 |
endRead(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
883 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
884 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
885 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
886 |
private static byte[] ROOTPATH = new byte[] { '/' }; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
887 |
private static byte[] getParent(byte[] path) { |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
888 |
int off = getParentOff(path); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
889 |
if (off <= 1) |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
890 |
return ROOTPATH; |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
891 |
return Arrays.copyOf(path, off); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
892 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
893 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
894 |
private static int getParentOff(byte[] path) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
895 |
int off = path.length - 1; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
896 |
if (off > 0 && path[off] == '/') // isDirectory |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
897 |
off--; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
898 |
while (off > 0 && path[off] != '/') { off--; } |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
899 |
return off; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
900 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
901 |
|
7189 | 902 |
private final void beginWrite() { |
903 |
rwlock.writeLock().lock(); |
|
904 |
} |
|
905 |
||
906 |
private final void endWrite() { |
|
907 |
rwlock.writeLock().unlock(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
908 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
909 |
|
7189 | 910 |
private final void beginRead() { |
911 |
rwlock.readLock().lock(); |
|
912 |
} |
|
913 |
||
914 |
private final void endRead() { |
|
915 |
rwlock.readLock().unlock(); |
|
916 |
} |
|
917 |
||
918 |
/////////////////////////////////////////////////////////////////// |
|
919 |
||
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
920 |
private volatile boolean isOpen = true; |
7189 | 921 |
private final SeekableByteChannel ch; // channel to the zipfile |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
922 |
final byte[] cen; // CEN & ENDHDR |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
923 |
private END end; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
924 |
private long locpos; // position of first LOC header (usually 0) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
925 |
|
7189 | 926 |
private final ReadWriteLock rwlock = new ReentrantReadWriteLock(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
927 |
|
7189 | 928 |
// name -> pos (in cen), IndexNode itself can be used as a "key" |
929 |
private LinkedHashMap<IndexNode, IndexNode> inodes; |
|
930 |
||
931 |
final byte[] getBytes(String name) { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
932 |
return zc.getBytes(name); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
933 |
} |
7189 | 934 |
|
935 |
final String getString(byte[] name) { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
936 |
return zc.toString(name); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
937 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
938 |
|
44534 | 939 |
@SuppressWarnings("deprecation") |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
940 |
protected void finalize() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
941 |
close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
942 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
943 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
944 |
// Reads len bytes of data from the specified offset into buf. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
945 |
// Returns the total number of bytes read. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
946 |
// Each/every byte read from here (except the cen, which is mapped). |
7189 | 947 |
final long readFullyAt(byte[] buf, int off, long len, long pos) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
948 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
949 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
950 |
ByteBuffer bb = ByteBuffer.wrap(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
951 |
bb.position(off); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
952 |
bb.limit((int)(off + len)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
953 |
return readFullyAt(bb, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
954 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
955 |
|
7189 | 956 |
private final long readFullyAt(ByteBuffer bb, long pos) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
957 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
958 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
959 |
synchronized(ch) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
960 |
return ch.position(pos).read(bb); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
961 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
962 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
963 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
964 |
// Searches for end of central directory (END) header. The contents of |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
965 |
// the END header will be read and placed in endbuf. Returns the file |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
966 |
// position of the END header, otherwise returns -1 if the END header |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
967 |
// was not found or an error occurred. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
968 |
private END findEND() throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
969 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
970 |
byte[] buf = new byte[READBLOCKSZ]; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
971 |
long ziplen = ch.size(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
972 |
long minHDR = (ziplen - END_MAXLEN) > 0 ? ziplen - END_MAXLEN : 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
973 |
long minPos = minHDR - (buf.length - ENDHDR); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
974 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
975 |
for (long pos = ziplen - buf.length; pos >= minPos; pos -= (buf.length - ENDHDR)) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
976 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
977 |
int off = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
978 |
if (pos < 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
979 |
// Pretend there are some NUL bytes before start of file |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
980 |
off = (int)-pos; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
981 |
Arrays.fill(buf, 0, off, (byte)0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
982 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
983 |
int len = buf.length - off; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
984 |
if (readFullyAt(buf, off, len, pos + off) != len) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
985 |
zerror("zip END header not found"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
986 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
987 |
// Now scan the block backwards for END header signature |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
988 |
for (int i = buf.length - ENDHDR; i >= 0; i--) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
989 |
if (buf[i+0] == (byte)'P' && |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
990 |
buf[i+1] == (byte)'K' && |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
991 |
buf[i+2] == (byte)'\005' && |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
992 |
buf[i+3] == (byte)'\006' && |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
993 |
(pos + i + ENDHDR + ENDCOM(buf, i) == ziplen)) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
994 |
// Found END header |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
995 |
buf = Arrays.copyOfRange(buf, i, i + ENDHDR); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
996 |
END end = new END(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
997 |
end.endsub = ENDSUB(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
998 |
end.centot = ENDTOT(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
999 |
end.cenlen = ENDSIZ(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1000 |
end.cenoff = ENDOFF(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1001 |
end.comlen = ENDCOM(buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1002 |
end.endpos = pos + i; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1003 |
if (end.cenlen == ZIP64_MINVAL || |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1004 |
end.cenoff == ZIP64_MINVAL || |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1005 |
end.centot == ZIP64_MINVAL32) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1006 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1007 |
// need to find the zip64 end; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1008 |
byte[] loc64 = new byte[ZIP64_LOCHDR]; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1009 |
if (readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1010 |
!= loc64.length) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1011 |
return end; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1012 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1013 |
long end64pos = ZIP64_LOCOFF(loc64); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1014 |
byte[] end64buf = new byte[ZIP64_ENDHDR]; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1015 |
if (readFullyAt(end64buf, 0, end64buf.length, end64pos) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1016 |
!= end64buf.length) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1017 |
return end; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1018 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1019 |
// end64 found, re-calcualte everything. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1020 |
end.cenlen = ZIP64_ENDSIZ(end64buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1021 |
end.cenoff = ZIP64_ENDOFF(end64buf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1022 |
end.centot = (int)ZIP64_ENDTOT(end64buf); // assume total < 2g |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1023 |
end.endpos = end64pos; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1024 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1025 |
return end; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1026 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1027 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1028 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1029 |
zerror("zip END header not found"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1030 |
return null; //make compiler happy |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1031 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1032 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1033 |
// Reads zip file central directory. Returns the file position of first |
21278 | 1034 |
// CEN header, otherwise returns -1 if an error occurred. If zip->msg != NULL |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1035 |
// then the error was a zip format error and zip->msg has the error text. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1036 |
// Always pass in -1 for knownTotal; it's used for a recursive call. |
7189 | 1037 |
private byte[] initCEN() throws IOException { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1038 |
end = findEND(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1039 |
if (end.endpos == 0) { |
7189 | 1040 |
inodes = new LinkedHashMap<>(10); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1041 |
locpos = 0; |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1042 |
buildNodeTree(); |
7189 | 1043 |
return null; // only END header present |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1044 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1045 |
if (end.cenlen > end.endpos) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1046 |
zerror("invalid END header (bad central directory size)"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1047 |
long cenpos = end.endpos - end.cenlen; // position of CEN table |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1048 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1049 |
// Get position of first local file (LOC) header, taking into |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1050 |
// account that there may be a stub prefixed to the zip file. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1051 |
locpos = cenpos - end.cenoff; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1052 |
if (locpos < 0) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1053 |
zerror("invalid END header (bad central directory offset)"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1054 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1055 |
// read in the CEN and END |
7189 | 1056 |
byte[] cen = new byte[(int)(end.cenlen + ENDHDR)]; |
1057 |
if (readFullyAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1058 |
zerror("read CEN tables failed"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1059 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1060 |
// Iterate through the entries in the central directory |
7189 | 1061 |
inodes = new LinkedHashMap<>(end.centot + 1); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1062 |
int pos = 0; |
7189 | 1063 |
int limit = cen.length - ENDHDR; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1064 |
while (pos < limit) { |
29714
afac043e9bf0
8075774: Small readability and performance improvements for zipfs
martin
parents:
29270
diff
changeset
|
1065 |
if (!cenSigAt(cen, pos)) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1066 |
zerror("invalid CEN header (bad signature)"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1067 |
int method = CENHOW(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1068 |
int nlen = CENNAM(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1069 |
int elen = CENEXT(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1070 |
int clen = CENCOM(cen, pos); |
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1071 |
if ((CENFLG(cen, pos) & 1) != 0) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1072 |
zerror("invalid CEN header (encrypted entry)"); |
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1073 |
} |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1074 |
if (method != METHOD_STORED && method != METHOD_DEFLATED) { |
7189 | 1075 |
zerror("invalid CEN header (unsupported compression method: " + method + ")"); |
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1076 |
} |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1077 |
if (pos + CENHDR + nlen > limit) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1078 |
zerror("invalid CEN header (bad header size)"); |
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1079 |
} |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1080 |
IndexNode inode = new IndexNode(cen, pos + CENHDR, nlen, pos); |
7189 | 1081 |
inodes.put(inode, inode); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1082 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1083 |
// skip ext and comment |
7189 | 1084 |
pos += (CENHDR + nlen + elen + clen); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1085 |
} |
7189 | 1086 |
if (pos + ENDHDR != cen.length) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1087 |
zerror("invalid CEN header (bad header size)"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1088 |
} |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1089 |
buildNodeTree(); |
7189 | 1090 |
return cen; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1091 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1092 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1093 |
private void ensureOpen() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1094 |
if (!isOpen) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1095 |
throw new ClosedFileSystemException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1096 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1097 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1098 |
// Creates a new empty temporary file in the same directory as the |
17699
dfa52f56753b
8004789: (zipfs) zip provider doesn't work correctly with file systems providers rather than the default
sherman
parents:
16857
diff
changeset
|
1099 |
// specified file. A variant of Files.createTempFile. |
7189 | 1100 |
private Path createTempFileInSameDirectoryAs(Path path) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1101 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1102 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1103 |
Path parent = path.toAbsolutePath().getParent(); |
17699
dfa52f56753b
8004789: (zipfs) zip provider doesn't work correctly with file systems providers rather than the default
sherman
parents:
16857
diff
changeset
|
1104 |
Path dir = (parent == null) ? path.getFileSystem().getPath(".") : parent; |
dfa52f56753b
8004789: (zipfs) zip provider doesn't work correctly with file systems providers rather than the default
sherman
parents:
16857
diff
changeset
|
1105 |
Path tmpPath = Files.createTempFile(dir, "zipfstmp", null); |
7189 | 1106 |
tmppaths.add(tmpPath); |
1107 |
return tmpPath; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1108 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1109 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1110 |
////////////////////update & sync ////////////////////////////////////// |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1111 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1112 |
private boolean hasUpdate = false; |
7189 | 1113 |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1114 |
// shared key. consumer guarantees the "writeLock" before use it. |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1115 |
private final IndexNode LOOKUPKEY = new IndexNode(null, -1); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1116 |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1117 |
private void updateDelete(IndexNode inode) { |
7189 | 1118 |
beginWrite(); |
1119 |
try { |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1120 |
removeFromTree(inode); |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1121 |
inodes.remove(inode); |
7189 | 1122 |
hasUpdate = true; |
1123 |
} finally { |
|
1124 |
endWrite(); |
|
1125 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1126 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1127 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1128 |
private void update(Entry e) { |
7189 | 1129 |
beginWrite(); |
1130 |
try { |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1131 |
IndexNode old = inodes.put(e, e); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1132 |
if (old != null) { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1133 |
removeFromTree(old); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1134 |
} |
16857
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
1135 |
if (e.type == Entry.NEW || e.type == Entry.FILECH || e.type == Entry.COPY) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1136 |
IndexNode parent = inodes.get(LOOKUPKEY.as(getParent(e.name))); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1137 |
e.sibling = parent.child; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1138 |
parent.child = e; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1139 |
} |
7189 | 1140 |
hasUpdate = true; |
1141 |
} finally { |
|
1142 |
endWrite(); |
|
1143 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1144 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1145 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1146 |
// copy over the whole LOC entry (header if necessary, data and ext) from |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1147 |
// old zip to the new one. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1148 |
private long copyLOCEntry(Entry e, boolean updateHeader, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1149 |
OutputStream os, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1150 |
long written, byte[] buf) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1151 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1152 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1153 |
long locoff = e.locoff; // where to read |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1154 |
e.locoff = written; // update the e.locoff with new value |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1155 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1156 |
// calculate the size need to write out |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1157 |
long size = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1158 |
// if there is A ext |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1159 |
if ((e.flag & FLAG_DATADESCR) != 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1160 |
if (e.size >= ZIP64_MINVAL || e.csize >= ZIP64_MINVAL) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1161 |
size = 24; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1162 |
else |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1163 |
size = 16; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1164 |
} |
7189 | 1165 |
// read loc, use the original loc.elen/nlen |
1166 |
if (readFullyAt(buf, 0, LOCHDR , locoff) != LOCHDR) |
|
1167 |
throw new ZipException("loc: reading failed"); |
|
1168 |
if (updateHeader) { |
|
1169 |
locoff += LOCHDR + LOCNAM(buf) + LOCEXT(buf); // skip header |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1170 |
size += e.csize; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1171 |
written = e.writeLOC(os) + size; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1172 |
} else { |
7189 | 1173 |
os.write(buf, 0, LOCHDR); // write out the loc header |
1174 |
locoff += LOCHDR; |
|
7531
77870839c857
6989148: (fs) zip provider should be available "out of the box"
sherman
parents:
7189
diff
changeset
|
1175 |
// use e.csize, LOCSIZ(buf) is zero if FLAG_DATADESCR is on |
77870839c857
6989148: (fs) zip provider should be available "out of the box"
sherman
parents:
7189
diff
changeset
|
1176 |
// size += LOCNAM(buf) + LOCEXT(buf) + LOCSIZ(buf); |
77870839c857
6989148: (fs) zip provider should be available "out of the box"
sherman
parents:
7189
diff
changeset
|
1177 |
size += LOCNAM(buf) + LOCEXT(buf) + e.csize; |
7189 | 1178 |
written = LOCHDR + size; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1179 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1180 |
int n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1181 |
while (size > 0 && |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1182 |
(n = (int)readFullyAt(buf, 0, buf.length, locoff)) != -1) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1183 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1184 |
if (size < n) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1185 |
n = (int)size; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1186 |
os.write(buf, 0, n); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1187 |
size -= n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1188 |
locoff += n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1189 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1190 |
return written; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1191 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1192 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1193 |
// sync the zip file system, if there is any udpate |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1194 |
private void sync() throws IOException { |
7189 | 1195 |
//System.out.printf("->sync(%s) starting....!%n", toString()); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1196 |
// check ex-closer |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1197 |
if (!exChClosers.isEmpty()) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1198 |
for (ExChannelCloser ecc : exChClosers) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1199 |
if (ecc.streams.isEmpty()) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1200 |
ecc.ch.close(); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1201 |
Files.delete(ecc.path); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1202 |
exChClosers.remove(ecc); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1203 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1204 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1205 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1206 |
if (!hasUpdate) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1207 |
return; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1208 |
Path tmpFile = createTempFileInSameDirectoryAs(zfpath); |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1209 |
try (OutputStream os = new BufferedOutputStream(Files.newOutputStream(tmpFile, WRITE))) |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1210 |
{ |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1211 |
ArrayList<Entry> elist = new ArrayList<>(inodes.size()); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1212 |
long written = 0; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1213 |
byte[] buf = new byte[8192]; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1214 |
Entry e = null; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1215 |
|
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1216 |
// write loc |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1217 |
for (IndexNode inode : inodes.values()) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1218 |
if (inode instanceof Entry) { // an updated inode |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1219 |
e = (Entry)inode; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1220 |
try { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1221 |
if (e.type == Entry.COPY) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1222 |
// entry copy: the only thing changed is the "name" |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1223 |
// and "nlen" in LOC header, so we udpate/rewrite the |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1224 |
// LOC in new file and simply copy the rest (data and |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1225 |
// ext) without enflating/deflating from the old zip |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1226 |
// file LOC entry. |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1227 |
written += copyLOCEntry(e, true, os, written, buf); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1228 |
} else { // NEW, FILECH or CEN |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1229 |
e.locoff = written; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1230 |
written += e.writeLOC(os); // write loc header |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1231 |
if (e.bytes != null) { // in-memory, deflated |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1232 |
os.write(e.bytes); // already |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1233 |
written += e.bytes.length; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1234 |
} else if (e.file != null) { // tmp file |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1235 |
try (InputStream is = Files.newInputStream(e.file)) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1236 |
int n; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1237 |
if (e.type == Entry.NEW) { // deflated already |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1238 |
while ((n = is.read(buf)) != -1) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1239 |
os.write(buf, 0, n); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1240 |
written += n; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1241 |
} |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1242 |
} else if (e.type == Entry.FILECH) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1243 |
// the data are not deflated, use ZEOS |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1244 |
try (OutputStream os2 = new EntryOutputStream(e, os)) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1245 |
while ((n = is.read(buf)) != -1) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1246 |
os2.write(buf, 0, n); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1247 |
} |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1248 |
} |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1249 |
written += e.csize; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1250 |
if ((e.flag & FLAG_DATADESCR) != 0) |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1251 |
written += e.writeEXT(os); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1252 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1253 |
} |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1254 |
Files.delete(e.file); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1255 |
tmppaths.remove(e.file); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1256 |
} else { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1257 |
// dir, 0-length data |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1258 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1259 |
} |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1260 |
elist.add(e); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1261 |
} catch (IOException x) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1262 |
x.printStackTrace(); // skip any in-accurate entry |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1263 |
} |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1264 |
} else { // unchanged inode |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1265 |
if (inode.pos == -1) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1266 |
continue; // pseudo directory node |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1267 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1268 |
e = Entry.readCEN(this, inode); |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1269 |
try { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1270 |
written += copyLOCEntry(e, false, os, written, buf); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1271 |
elist.add(e); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1272 |
} catch (IOException x) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1273 |
x.printStackTrace(); // skip any wrong entry |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1274 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1275 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1276 |
} |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1277 |
|
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1278 |
// now write back the cen and end table |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1279 |
end.cenoff = written; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1280 |
for (Entry entry : elist) { |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1281 |
written += entry.writeCEN(os); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1282 |
} |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1283 |
end.centot = elist.size(); |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1284 |
end.cenlen = written - end.cenoff; |
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
1285 |
end.write(os, written); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1286 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1287 |
if (!streams.isEmpty()) { |
7189 | 1288 |
// |
1289 |
// TBD: ExChannelCloser should not be necessary if we only |
|
1290 |
// sync when being closed, all streams should have been |
|
1291 |
// closed already. Keep the logic here for now. |
|
1292 |
// |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1293 |
// There are outstanding input streams open on existing "ch", |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1294 |
// so, don't close the "cha" and delete the "file for now, let |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1295 |
// the "ex-channel-closer" to handle them |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1296 |
ExChannelCloser ecc = new ExChannelCloser( |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1297 |
createTempFileInSameDirectoryAs(zfpath), |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1298 |
ch, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1299 |
streams); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1300 |
Files.move(zfpath, ecc.path, REPLACE_EXISTING); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1301 |
exChClosers.add(ecc); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1302 |
streams = Collections.synchronizedSet(new HashSet<InputStream>()); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1303 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1304 |
ch.close(); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1305 |
Files.delete(zfpath); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1306 |
} |
7189 | 1307 |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1308 |
Files.move(tmpFile, zfpath, REPLACE_EXISTING); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1309 |
hasUpdate = false; // clear |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1310 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1311 |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
1312 |
IndexNode getInode(byte[] path) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1313 |
if (path == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1314 |
throw new NullPointerException("path"); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1315 |
return inodes.get(IndexNode.keyOf(path)); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1316 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1317 |
|
34835
ee52702b8d1b
8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
30811
diff
changeset
|
1318 |
Entry getEntry(byte[] path) throws IOException { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1319 |
IndexNode inode = getInode(path); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1320 |
if (inode instanceof Entry) |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1321 |
return (Entry)inode; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1322 |
if (inode == null || inode.pos == -1) |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1323 |
return null; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1324 |
return Entry.readCEN(this, inode); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1325 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1326 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1327 |
public void deleteFile(byte[] path, boolean failIfNotExists) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1328 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1329 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1330 |
checkWritable(); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1331 |
|
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1332 |
IndexNode inode = getInode(path); |
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1333 |
if (inode == null) { |
7189 | 1334 |
if (path != null && path.length == 0) |
1335 |
throw new ZipException("root directory </> can't not be delete"); |
|
1336 |
if (failIfNotExists) |
|
1337 |
throw new NoSuchFileException(getString(path)); |
|
1338 |
} else { |
|
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1339 |
if (inode.isDir() && inode.child != null) |
7189 | 1340 |
throw new DirectoryNotEmptyException(getString(path)); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1341 |
updateDelete(inode); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1342 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1343 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1344 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1345 |
private static void copyStream(InputStream is, OutputStream os) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1346 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1347 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1348 |
byte[] copyBuf = new byte[8192]; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1349 |
int n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1350 |
while ((n = is.read(copyBuf)) != -1) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1351 |
os.write(copyBuf, 0, n); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1352 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1353 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1354 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1355 |
// Returns an out stream for either |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1356 |
// (1) writing the contents of a new entry, if the entry exits, or |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1357 |
// (2) updating/replacing the contents of the specified existing entry. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1358 |
private OutputStream getOutputStream(Entry e) throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1359 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1360 |
if (e.mtime == -1) |
7189 | 1361 |
e.mtime = System.currentTimeMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1362 |
if (e.method == -1) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1363 |
e.method = METHOD_DEFLATED; // TBD: use default method |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1364 |
// store size, compressed size, and crc-32 in LOC header |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1365 |
e.flag = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1366 |
if (zc.isUTF8()) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1367 |
e.flag |= FLAG_EFS; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1368 |
OutputStream os; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1369 |
if (useTempFile) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1370 |
e.file = getTempPathForEntry(null); |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1371 |
os = Files.newOutputStream(e.file, WRITE); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1372 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1373 |
os = new ByteArrayOutputStream((e.size > 0)? (int)e.size : 8192); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1374 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1375 |
return new EntryOutputStream(e, os); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1376 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1377 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1378 |
private InputStream getInputStream(Entry e) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1379 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1380 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1381 |
InputStream eis = null; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1382 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1383 |
if (e.type == Entry.NEW) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1384 |
if (e.bytes != null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1385 |
eis = new ByteArrayInputStream(e.bytes); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1386 |
else if (e.file != null) |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1387 |
eis = Files.newInputStream(e.file); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1388 |
else |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1389 |
throw new ZipException("update entry data is missing"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1390 |
} else if (e.type == Entry.FILECH) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1391 |
// FILECH result is un-compressed. |
8165
b67d8b1f4e46
7015391: (zipfs) Update zip provider for 1/2011 changes
sherman
parents:
8005
diff
changeset
|
1392 |
eis = Files.newInputStream(e.file); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1393 |
// TBD: wrap to hook close() |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1394 |
// streams.add(eis); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1395 |
return eis; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1396 |
} else { // untouced CEN or COPY |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1397 |
eis = new EntryInputStream(e, ch); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1398 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1399 |
if (e.method == METHOD_DEFLATED) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1400 |
// MORE: Compute good size for inflater stream: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1401 |
long bufSize = e.size + 2; // Inflater likes a bit of slack |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1402 |
if (bufSize > 65536) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1403 |
bufSize = 8192; |
7189 | 1404 |
final long size = e.size; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1405 |
eis = new InflaterInputStream(eis, getInflater(), (int)bufSize) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1406 |
private boolean isClosed = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1407 |
public void close() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1408 |
if (!isClosed) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1409 |
releaseInflater(inf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1410 |
this.in.close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1411 |
isClosed = true; |
7189 | 1412 |
streams.remove(this); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1413 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1414 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1415 |
// Override fill() method to provide an extra "dummy" byte |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1416 |
// at the end of the input stream. This is required when |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1417 |
// using the "nowrap" Inflater option. (it appears the new |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1418 |
// zlib in 7 does not need it, but keep it for now) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1419 |
protected void fill() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1420 |
if (eof) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1421 |
throw new EOFException( |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1422 |
"Unexpected end of ZLIB input stream"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1423 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1424 |
len = this.in.read(buf, 0, buf.length); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1425 |
if (len == -1) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1426 |
buf[0] = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1427 |
len = 1; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1428 |
eof = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1429 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1430 |
inf.setInput(buf, 0, len); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1431 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1432 |
private boolean eof; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1433 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1434 |
public int available() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1435 |
if (isClosed) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1436 |
return 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1437 |
long avail = size - inf.getBytesWritten(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1438 |
return avail > (long) Integer.MAX_VALUE ? |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1439 |
Integer.MAX_VALUE : (int) avail; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1440 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1441 |
}; |
7189 | 1442 |
} else if (e.method == METHOD_STORED) { |
1443 |
// TBD: wrap/ it does not seem necessary |
|
1444 |
} else { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1445 |
throw new ZipException("invalid compression method"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1446 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1447 |
streams.add(eis); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1448 |
return eis; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1449 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1450 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1451 |
// Inner class implementing the input stream used to read |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1452 |
// a (possibly compressed) zip file entry. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1453 |
private class EntryInputStream extends InputStream { |
7189 | 1454 |
private final SeekableByteChannel zfch; // local ref to zipfs's "ch". zipfs.ch might |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1455 |
// point to a new channel after sync() |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1456 |
private long pos; // current position within entry data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1457 |
protected long rem; // number of remaining bytes within entry |
7189 | 1458 |
protected final long size; // uncompressed size of this entry |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1459 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1460 |
EntryInputStream(Entry e, SeekableByteChannel zfch) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1461 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1462 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1463 |
this.zfch = zfch; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1464 |
rem = e.csize; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1465 |
size = e.size; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1466 |
pos = e.locoff; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1467 |
if (pos == -1) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1468 |
Entry e2 = getEntry(e.name); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1469 |
if (e2 == null) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1470 |
throw new ZipException("invalid loc for entry <" + e.name + ">"); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1471 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1472 |
pos = e2.locoff; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1473 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1474 |
pos = -pos; // lazy initialize the real data offset |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1475 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1476 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1477 |
public int read(byte b[], int off, int len) throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1478 |
ensureOpen(); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1479 |
initDataPos(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1480 |
if (rem == 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1481 |
return -1; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1482 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1483 |
if (len <= 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1484 |
return 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1485 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1486 |
if (len > rem) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1487 |
len = (int) rem; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1488 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1489 |
// readFullyAt() |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1490 |
long n = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1491 |
ByteBuffer bb = ByteBuffer.wrap(b); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1492 |
bb.position(off); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1493 |
bb.limit(off + len); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1494 |
synchronized(zfch) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1495 |
n = zfch.position(pos).read(bb); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1496 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1497 |
if (n > 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1498 |
pos += n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1499 |
rem -= n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1500 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1501 |
if (rem == 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1502 |
close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1503 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1504 |
return (int)n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1505 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1506 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1507 |
public int read() throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1508 |
byte[] b = new byte[1]; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1509 |
if (read(b, 0, 1) == 1) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1510 |
return b[0] & 0xff; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1511 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1512 |
return -1; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1513 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1514 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1515 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1516 |
public long skip(long n) throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1517 |
ensureOpen(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1518 |
if (n > rem) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1519 |
n = rem; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1520 |
pos += n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1521 |
rem -= n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1522 |
if (rem == 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1523 |
close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1524 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1525 |
return n; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1526 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1527 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1528 |
public int available() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1529 |
return rem > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) rem; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1530 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1531 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1532 |
public long size() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1533 |
return size; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1534 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1535 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1536 |
public void close() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1537 |
rem = 0; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1538 |
streams.remove(this); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1539 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1540 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1541 |
private void initDataPos() throws IOException { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1542 |
if (pos <= 0) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1543 |
pos = -pos + locpos; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1544 |
byte[] buf = new byte[LOCHDR]; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1545 |
if (readFullyAt(buf, 0, buf.length, pos) != LOCHDR) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1546 |
throw new ZipException("invalid loc " + pos + " for entry reading"); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1547 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1548 |
pos += LOCHDR + LOCNAM(buf) + LOCEXT(buf); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1549 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1550 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1551 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1552 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1553 |
class EntryOutputStream extends DeflaterOutputStream |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1554 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1555 |
private CRC32 crc; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1556 |
private Entry e; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1557 |
private long written; |
28561
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1558 |
private boolean isClosed = false; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1559 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1560 |
EntryOutputStream(Entry e, OutputStream os) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1561 |
throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1562 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1563 |
super(os, getDeflater()); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1564 |
if (e == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1565 |
throw new NullPointerException("Zip entry is null"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1566 |
this.e = e; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1567 |
crc = new CRC32(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1568 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1569 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1570 |
@Override |
28561
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1571 |
public synchronized void write(byte b[], int off, int len) |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1572 |
throws IOException |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1573 |
{ |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1574 |
if (e.type != Entry.FILECH) // only from sync |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1575 |
ensureOpen(); |
28561
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1576 |
if (isClosed) { |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1577 |
throw new IOException("Stream closed"); |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1578 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1579 |
if (off < 0 || len < 0 || off > b.length - len) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1580 |
throw new IndexOutOfBoundsException(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1581 |
} else if (len == 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1582 |
return; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1583 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1584 |
switch (e.method) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1585 |
case METHOD_DEFLATED: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1586 |
super.write(b, off, len); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1587 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1588 |
case METHOD_STORED: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1589 |
written += len; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1590 |
out.write(b, off, len); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1591 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1592 |
default: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1593 |
throw new ZipException("invalid compression method"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1594 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1595 |
crc.update(b, off, len); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1596 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1597 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1598 |
@Override |
28561
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1599 |
public synchronized void close() throws IOException { |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1600 |
if (isClosed) { |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1601 |
return; |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1602 |
} |
bdb3c1d3a975
8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
sherman
parents:
25859
diff
changeset
|
1603 |
isClosed = true; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1604 |
// TBD ensureOpen(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1605 |
switch (e.method) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1606 |
case METHOD_DEFLATED: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1607 |
finish(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1608 |
e.size = def.getBytesRead(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1609 |
e.csize = def.getBytesWritten(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1610 |
e.crc = crc.getValue(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1611 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1612 |
case METHOD_STORED: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1613 |
// we already know that both e.size and e.csize are the same |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1614 |
e.size = e.csize = written; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1615 |
e.crc = crc.getValue(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1616 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1617 |
default: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1618 |
throw new ZipException("invalid compression method"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1619 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1620 |
//crc.reset(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1621 |
if (out instanceof ByteArrayOutputStream) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1622 |
e.bytes = ((ByteArrayOutputStream)out).toByteArray(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1623 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1624 |
if (e.type == Entry.FILECH) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1625 |
releaseDeflater(def); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1626 |
return; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1627 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1628 |
super.close(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1629 |
releaseDeflater(def); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1630 |
update(e); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1631 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1632 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1633 |
|
28562
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1634 |
static void zerror(String msg) throws ZipException { |
a3e34b364d38
8037394: ZipFileSystem leaks file descriptor when file is not a valid zip file
sherman
parents:
28561
diff
changeset
|
1635 |
throw new ZipException(msg); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1636 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1637 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1638 |
// Maxmum number of de/inflater we cache |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1639 |
private final int MAX_FLATER = 20; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1640 |
// List of available Inflater objects for decompression |
7189 | 1641 |
private final List<Inflater> inflaters = new ArrayList<>(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1642 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1643 |
// Gets an inflater from the list of available inflaters or allocates |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1644 |
// a new one. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1645 |
private Inflater getInflater() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1646 |
synchronized (inflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1647 |
int size = inflaters.size(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1648 |
if (size > 0) { |
11841
38a39c748880
7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents:
10373
diff
changeset
|
1649 |
Inflater inf = inflaters.remove(size - 1); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1650 |
return inf; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1651 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1652 |
return new Inflater(true); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1653 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1654 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1655 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1656 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1657 |
// Releases the specified inflater to the list of available inflaters. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1658 |
private void releaseInflater(Inflater inf) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1659 |
synchronized (inflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1660 |
if (inflaters.size() < MAX_FLATER) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1661 |
inf.reset(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1662 |
inflaters.add(inf); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1663 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1664 |
inf.end(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1665 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1666 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1667 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1668 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1669 |
// List of available Deflater objects for compression |
7189 | 1670 |
private final List<Deflater> deflaters = new ArrayList<>(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1671 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1672 |
// Gets an deflater from the list of available deflaters or allocates |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1673 |
// a new one. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1674 |
private Deflater getDeflater() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1675 |
synchronized (deflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1676 |
int size = deflaters.size(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1677 |
if (size > 0) { |
11841
38a39c748880
7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents:
10373
diff
changeset
|
1678 |
Deflater def = deflaters.remove(size - 1); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1679 |
return def; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1680 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1681 |
return new Deflater(Deflater.DEFAULT_COMPRESSION, true); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1682 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1683 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1684 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1685 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1686 |
// Releases the specified inflater to the list of available inflaters. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1687 |
private void releaseDeflater(Deflater def) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1688 |
synchronized (deflaters) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1689 |
if (inflaters.size() < MAX_FLATER) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1690 |
def.reset(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1691 |
deflaters.add(def); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1692 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1693 |
def.end(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1694 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1695 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1696 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1697 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1698 |
// End of central directory record |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1699 |
static class END { |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1700 |
// these 2 fields are not used by anyone and write() uses "0" |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1701 |
// int disknum; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1702 |
// int sdisknum; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1703 |
int endsub; // endsub |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1704 |
int centot; // 4 bytes |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1705 |
long cenlen; // 4 bytes |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1706 |
long cenoff; // 4 bytes |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1707 |
int comlen; // comment length |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1708 |
byte[] comment; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1709 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1710 |
/* members of Zip64 end of central directory locator */ |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1711 |
// int diskNum; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1712 |
long endpos; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1713 |
// int disktot; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1714 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1715 |
void write(OutputStream os, long offset) throws IOException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1716 |
boolean hasZip64 = false; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1717 |
long xlen = cenlen; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1718 |
long xoff = cenoff; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1719 |
if (xlen >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1720 |
xlen = ZIP64_MINVAL; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1721 |
hasZip64 = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1722 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1723 |
if (xoff >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1724 |
xoff = ZIP64_MINVAL; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1725 |
hasZip64 = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1726 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1727 |
int count = centot; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1728 |
if (count >= ZIP64_MINVAL32) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1729 |
count = ZIP64_MINVAL32; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1730 |
hasZip64 = true; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1731 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1732 |
if (hasZip64) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1733 |
long off64 = offset; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1734 |
//zip64 end of central directory record |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1735 |
writeInt(os, ZIP64_ENDSIG); // zip64 END record signature |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1736 |
writeLong(os, ZIP64_ENDHDR - 12); // size of zip64 end |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1737 |
writeShort(os, 45); // version made by |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1738 |
writeShort(os, 45); // version needed to extract |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1739 |
writeInt(os, 0); // number of this disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1740 |
writeInt(os, 0); // central directory start disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1741 |
writeLong(os, centot); // number of directory entires on disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1742 |
writeLong(os, centot); // number of directory entires |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1743 |
writeLong(os, cenlen); // length of central directory |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1744 |
writeLong(os, cenoff); // offset of central directory |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1745 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1746 |
//zip64 end of central directory locator |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1747 |
writeInt(os, ZIP64_LOCSIG); // zip64 END locator signature |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1748 |
writeInt(os, 0); // zip64 END start disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1749 |
writeLong(os, off64); // offset of zip64 END |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1750 |
writeInt(os, 1); // total number of disks (?) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1751 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1752 |
writeInt(os, ENDSIG); // END record signature |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1753 |
writeShort(os, 0); // number of this disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1754 |
writeShort(os, 0); // central directory start disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1755 |
writeShort(os, count); // number of directory entries on disk |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1756 |
writeShort(os, count); // total number of directory entries |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1757 |
writeInt(os, xlen); // length of central directory |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1758 |
writeInt(os, xoff); // offset of central directory |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1759 |
if (comment != null) { // zip file comment |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1760 |
writeShort(os, comment.length); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1761 |
writeBytes(os, comment); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1762 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1763 |
writeShort(os, 0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1764 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1765 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1766 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1767 |
|
7189 | 1768 |
// Internal node that links a "name" to its pos in cen table. |
1769 |
// The node itself can be used as a "key" to lookup itself in |
|
1770 |
// the HashMap inodes. |
|
1771 |
static class IndexNode { |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1772 |
byte[] name; |
7189 | 1773 |
int hashcode; // node is hashable/hashed by its name |
21278 | 1774 |
int pos = -1; // position in cen table, -1 menas the |
7189 | 1775 |
// entry does not exists in zip file |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1776 |
boolean isdir; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1777 |
|
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1778 |
IndexNode(byte[] name, boolean isdir) { |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1779 |
name(name); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1780 |
this.isdir = isdir; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1781 |
this.pos = -1; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1782 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1783 |
|
7189 | 1784 |
IndexNode(byte[] name, int pos) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1785 |
name(name); |
7189 | 1786 |
this.pos = pos; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1787 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1788 |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1789 |
// constructor for cenInit() |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1790 |
IndexNode(byte[] cen, int noff, int nlen, int pos) { |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1791 |
if (cen[noff + nlen - 1] == '/') { |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1792 |
isdir = true; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1793 |
nlen--; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1794 |
} |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1795 |
name = new byte[nlen + 1]; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1796 |
System.arraycopy(cen, pos + CENHDR, name, 1, nlen); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1797 |
name[0] = '/'; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1798 |
name(name); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1799 |
this.pos = pos; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1800 |
} |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1801 |
|
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1802 |
private static final ThreadLocal<IndexNode> cachedKey = new ThreadLocal<>(); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1803 |
|
7189 | 1804 |
final static IndexNode keyOf(byte[] name) { // get a lookup key; |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1805 |
IndexNode key = cachedKey.get(); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1806 |
if (key == null) { |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1807 |
key = new IndexNode(name, -1); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1808 |
cachedKey.set(key); |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1809 |
} |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1810 |
return key.as(name); |
7189 | 1811 |
} |
1812 |
||
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1813 |
final void name(byte[] name) { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1814 |
this.name = name; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1815 |
this.hashcode = Arrays.hashCode(name); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1816 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1817 |
|
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1818 |
final IndexNode as(byte[] name) { // reuse the node, mostly |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1819 |
name(name); // as a lookup "key" |
7189 | 1820 |
return this; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1821 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1822 |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1823 |
boolean isDir() { |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1824 |
return isdir; |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1825 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1826 |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1827 |
public boolean equals(Object other) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1828 |
if (!(other instanceof IndexNode)) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1829 |
return false; |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1830 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1831 |
if (other instanceof ParentLookup) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1832 |
return ((ParentLookup)other).equals(this); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1833 |
} |
7189 | 1834 |
return Arrays.equals(name, ((IndexNode)other).name); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1835 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1836 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1837 |
public int hashCode() { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1838 |
return hashcode; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1839 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1840 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1841 |
IndexNode() {} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1842 |
IndexNode sibling; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1843 |
IndexNode child; // 1st child |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1844 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1845 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1846 |
static class Entry extends IndexNode implements ZipFileAttributes { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1847 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1848 |
static final int CEN = 1; // entry read from cen |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1849 |
static final int NEW = 2; // updated contents in bytes or file |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1850 |
static final int FILECH = 3; // fch update in "file" |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1851 |
static final int COPY = 4; // copy of a CEN entry |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1852 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1853 |
byte[] bytes; // updated content bytes |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1854 |
Path file; // use tmp file to store bytes; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1855 |
int type = CEN; // default is the entry read from cen |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1856 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1857 |
// entry attributes |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1858 |
int version; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1859 |
int flag; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1860 |
int method = -1; // compression method |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1861 |
long mtime = -1; // last modification time (in DOS time) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1862 |
long atime = -1; // last access time |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1863 |
long ctime = -1; // create time |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1864 |
long crc = -1; // crc-32 of entry data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1865 |
long csize = -1; // compressed size of entry data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1866 |
long size = -1; // uncompressed size of entry data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1867 |
byte[] extra; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1868 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1869 |
// cen |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1870 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1871 |
// these fields are not used by anyone and writeCEN uses "0" |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1872 |
// int versionMade; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1873 |
// int disk; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1874 |
// int attrs; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1875 |
// long attrsEx; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1876 |
long locoff; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1877 |
byte[] comment; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1878 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1879 |
Entry() {} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1880 |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1881 |
Entry(byte[] name, boolean isdir) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1882 |
name(name); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1883 |
this.isdir = isdir; |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
1884 |
this.mtime = this.ctime = this.atime = System.currentTimeMillis(); |
7189 | 1885 |
this.crc = 0; |
1886 |
this.size = 0; |
|
1887 |
this.csize = 0; |
|
1888 |
this.method = METHOD_DEFLATED; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1889 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1890 |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1891 |
Entry(byte[] name, int type, boolean isdir) { |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1892 |
this(name, isdir); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1893 |
this.type = type; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1894 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1895 |
|
7189 | 1896 |
Entry (Entry e, int type) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
1897 |
name(e.name); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1898 |
this.isdir = e.isdir; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1899 |
this.version = e.version; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1900 |
this.ctime = e.ctime; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1901 |
this.atime = e.atime; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1902 |
this.mtime = e.mtime; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1903 |
this.crc = e.crc; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1904 |
this.size = e.size; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1905 |
this.csize = e.csize; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1906 |
this.method = e.method; |
7189 | 1907 |
this.extra = e.extra; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1908 |
/* |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1909 |
this.versionMade = e.versionMade; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1910 |
this.disk = e.disk; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1911 |
this.attrs = e.attrs; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1912 |
this.attrsEx = e.attrsEx; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1913 |
*/ |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1914 |
this.locoff = e.locoff; |
7189 | 1915 |
this.comment = e.comment; |
1916 |
this.type = type; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1917 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1918 |
|
7189 | 1919 |
Entry (byte[] name, Path file, int type) { |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1920 |
this(name, type, false); |
7189 | 1921 |
this.file = file; |
1922 |
this.method = METHOD_STORED; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1923 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1924 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1925 |
int version() throws ZipException { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1926 |
if (method == METHOD_DEFLATED) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1927 |
return 20; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1928 |
else if (method == METHOD_STORED) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1929 |
return 10; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1930 |
throw new ZipException("unsupported compression method"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1931 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1932 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1933 |
///////////////////// CEN ////////////////////// |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1934 |
static Entry readCEN(ZipFileSystem zipfs, IndexNode inode) |
7189 | 1935 |
throws IOException |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1936 |
{ |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1937 |
return new Entry().cen(zipfs, inode); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1938 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1939 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1940 |
private Entry cen(ZipFileSystem zipfs, IndexNode inode) |
7189 | 1941 |
throws IOException |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1942 |
{ |
7189 | 1943 |
byte[] cen = zipfs.cen; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1944 |
int pos = inode.pos; |
29714
afac043e9bf0
8075774: Small readability and performance improvements for zipfs
martin
parents:
29270
diff
changeset
|
1945 |
if (!cenSigAt(cen, pos)) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1946 |
zerror("invalid CEN header (bad signature)"); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1947 |
version = CENVER(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1948 |
flag = CENFLG(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1949 |
method = CENHOW(cen, pos); |
7189 | 1950 |
mtime = dosToJavaTime(CENTIM(cen, pos)); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1951 |
crc = CENCRC(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1952 |
csize = CENSIZ(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1953 |
size = CENLEN(cen, pos); |
7189 | 1954 |
int nlen = CENNAM(cen, pos); |
1955 |
int elen = CENEXT(cen, pos); |
|
1956 |
int clen = CENCOM(cen, pos); |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1957 |
/* |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1958 |
versionMade = CENVEM(cen, pos); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1959 |
disk = CENDSK(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1960 |
attrs = CENATT(cen, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1961 |
attrsEx = CENATX(cen, pos); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1962 |
*/ |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1963 |
locoff = CENOFF(cen, pos); |
7189 | 1964 |
pos += CENHDR; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1965 |
this.name = inode.name; |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1966 |
this.isdir = inode.isdir; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1967 |
this.hashcode = inode.hashcode; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1968 |
|
7189 | 1969 |
pos += nlen; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1970 |
if (elen > 0) { |
7189 | 1971 |
extra = Arrays.copyOfRange(cen, pos, pos + elen); |
1972 |
pos += elen; |
|
1973 |
readExtra(zipfs); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1974 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1975 |
if (clen > 0) { |
7189 | 1976 |
comment = Arrays.copyOfRange(cen, pos, pos + clen); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1977 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1978 |
return this; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1979 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1980 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1981 |
int writeCEN(OutputStream os) throws IOException |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1982 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1983 |
int written = CENHDR; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1984 |
int version0 = version(); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1985 |
long csize0 = csize; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1986 |
long size0 = size; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1987 |
long locoff0 = locoff; |
7189 | 1988 |
int elen64 = 0; // extra for ZIP64 |
1989 |
int elenNTFS = 0; // extra for NTFS (a/c/mtime) |
|
1990 |
int elenEXTT = 0; // extra for Extended Timestamp |
|
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
1991 |
boolean foundExtraTime = false; // if time stamp NTFS, EXTT present |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
1992 |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1993 |
byte[] zname = isdir ? toDirectoryPath(name) : name; |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
1994 |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1995 |
// confirm size/length |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
1996 |
int nlen = (zname != null) ? zname.length - 1 : 0; // name has [0] as "slash" |
7189 | 1997 |
int elen = (extra != null) ? extra.length : 0; |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
1998 |
int eoff = 0; |
7189 | 1999 |
int clen = (comment != null) ? comment.length : 0; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2000 |
if (csize >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2001 |
csize0 = ZIP64_MINVAL; |
7189 | 2002 |
elen64 += 8; // csize(8) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2003 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2004 |
if (size >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2005 |
size0 = ZIP64_MINVAL; // size(8) |
7189 | 2006 |
elen64 += 8; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2007 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2008 |
if (locoff >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2009 |
locoff0 = ZIP64_MINVAL; |
7189 | 2010 |
elen64 += 8; // offset(8) |
2011 |
} |
|
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2012 |
if (elen64 != 0) { |
7189 | 2013 |
elen64 += 4; // header and data sz 4 bytes |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2014 |
} |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2015 |
while (eoff + 4 < elen) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2016 |
int tag = SH(extra, eoff); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2017 |
int sz = SH(extra, eoff + 2); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2018 |
if (tag == EXTID_EXTT || tag == EXTID_NTFS) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2019 |
foundExtraTime = true; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2020 |
} |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2021 |
eoff += (4 + sz); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2022 |
} |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2023 |
if (!foundExtraTime) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2024 |
if (isWindows) { // use NTFS |
7189 | 2025 |
elenNTFS = 36; // total 36 bytes |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2026 |
} else { // Extended Timestamp otherwise |
7189 | 2027 |
elenEXTT = 9; // only mtime in cen |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2028 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2029 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2030 |
writeInt(os, CENSIG); // CEN header signature |
7189 | 2031 |
if (elen64 != 0) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2032 |
writeShort(os, 45); // ver 4.5 for zip64 |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2033 |
writeShort(os, 45); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2034 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2035 |
writeShort(os, version0); // version made by |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2036 |
writeShort(os, version0); // version needed to extract |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2037 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2038 |
writeShort(os, flag); // general purpose bit flag |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2039 |
writeShort(os, method); // compression method |
7189 | 2040 |
// last modification time |
2041 |
writeInt(os, (int)javaToDosTime(mtime)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2042 |
writeInt(os, crc); // crc-32 |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2043 |
writeInt(os, csize0); // compressed size |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2044 |
writeInt(os, size0); // uncompressed size |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2045 |
writeShort(os, nlen); |
7189 | 2046 |
writeShort(os, elen + elen64 + elenNTFS + elenEXTT); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2047 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2048 |
if (comment != null) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2049 |
writeShort(os, Math.min(clen, 0xffff)); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2050 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2051 |
writeShort(os, 0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2052 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2053 |
writeShort(os, 0); // starting disk number |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2054 |
writeShort(os, 0); // internal file attributes (unused) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2055 |
writeInt(os, 0); // external file attributes (unused) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2056 |
writeInt(os, locoff0); // relative offset of local header |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2057 |
writeBytes(os, zname, 1, nlen); |
7189 | 2058 |
if (elen64 != 0) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2059 |
writeShort(os, EXTID_ZIP64);// Zip64 extra |
10365
8a89ee820687
7077769: (zipfs) ZipFileSystem.writeCEN() writes wrong "data size" for ZIP64 extended information extra field
sherman
parents:
9035
diff
changeset
|
2060 |
writeShort(os, elen64 - 4); // size of "this" extra block |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2061 |
if (size0 == ZIP64_MINVAL) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2062 |
writeLong(os, size); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2063 |
if (csize0 == ZIP64_MINVAL) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2064 |
writeLong(os, csize); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2065 |
if (locoff0 == ZIP64_MINVAL) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2066 |
writeLong(os, locoff); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2067 |
} |
7189 | 2068 |
if (elenNTFS != 0) { |
2069 |
writeShort(os, EXTID_NTFS); |
|
2070 |
writeShort(os, elenNTFS - 4); |
|
2071 |
writeInt(os, 0); // reserved |
|
2072 |
writeShort(os, 0x0001); // NTFS attr tag |
|
2073 |
writeShort(os, 24); |
|
2074 |
writeLong(os, javaToWinTime(mtime)); |
|
2075 |
writeLong(os, javaToWinTime(atime)); |
|
2076 |
writeLong(os, javaToWinTime(ctime)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2077 |
} |
7189 | 2078 |
if (elenEXTT != 0) { |
2079 |
writeShort(os, EXTID_EXTT); |
|
2080 |
writeShort(os, elenEXTT - 4); |
|
2081 |
if (ctime == -1) |
|
2082 |
os.write(0x3); // mtime and atime |
|
2083 |
else |
|
2084 |
os.write(0x7); // mtime, atime and ctime |
|
2085 |
writeInt(os, javaToUnixTime(mtime)); |
|
2086 |
} |
|
2087 |
if (extra != null) // whatever not recognized |
|
2088 |
writeBytes(os, extra); |
|
2089 |
if (comment != null) //TBD: 0, Math.min(commentBytes.length, 0xffff)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2090 |
writeBytes(os, comment); |
7189 | 2091 |
return CENHDR + nlen + elen + clen + elen64 + elenNTFS + elenEXTT; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2092 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2093 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2094 |
///////////////////// LOC ////////////////////// |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2095 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2096 |
int writeLOC(OutputStream os) throws IOException { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2097 |
writeInt(os, LOCSIG); // LOC header signature |
7189 | 2098 |
int version = version(); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2099 |
|
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2100 |
byte[] zname = isdir ? toDirectoryPath(name) : name; |
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2101 |
int nlen = (zname != null) ? zname.length - 1 : 0; // [0] is slash |
7189 | 2102 |
int elen = (extra != null) ? extra.length : 0; |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2103 |
boolean foundExtraTime = false; // if extra timestamp present |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2104 |
int eoff = 0; |
7189 | 2105 |
int elen64 = 0; |
2106 |
int elenEXTT = 0; |
|
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2107 |
int elenNTFS = 0; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2108 |
if ((flag & FLAG_DATADESCR) != 0) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2109 |
writeShort(os, version()); // version needed to extract |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2110 |
writeShort(os, flag); // general purpose bit flag |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2111 |
writeShort(os, method); // compression method |
7189 | 2112 |
// last modification time |
2113 |
writeInt(os, (int)javaToDosTime(mtime)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2114 |
// store size, uncompressed size, and crc-32 in data descriptor |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2115 |
// immediately following compressed entry data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2116 |
writeInt(os, 0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2117 |
writeInt(os, 0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2118 |
writeInt(os, 0); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2119 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2120 |
if (csize >= ZIP64_MINVAL || size >= ZIP64_MINVAL) { |
7189 | 2121 |
elen64 = 20; //headid(2) + size(2) + size(8) + csize(8) |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2122 |
writeShort(os, 45); // ver 4.5 for zip64 |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2123 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2124 |
writeShort(os, version()); // version needed to extract |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2125 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2126 |
writeShort(os, flag); // general purpose bit flag |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2127 |
writeShort(os, method); // compression method |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2128 |
// last modification time |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2129 |
writeInt(os, (int)javaToDosTime(mtime)); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2130 |
writeInt(os, crc); // crc-32 |
7189 | 2131 |
if (elen64 != 0) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2132 |
writeInt(os, ZIP64_MINVAL); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2133 |
writeInt(os, ZIP64_MINVAL); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2134 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2135 |
writeInt(os, csize); // compressed size |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2136 |
writeInt(os, size); // uncompressed size |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2137 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2138 |
} |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2139 |
while (eoff + 4 < elen) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2140 |
int tag = SH(extra, eoff); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2141 |
int sz = SH(extra, eoff + 2); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2142 |
if (tag == EXTID_EXTT || tag == EXTID_NTFS) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2143 |
foundExtraTime = true; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2144 |
} |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2145 |
eoff += (4 + sz); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2146 |
} |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2147 |
if (!foundExtraTime) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2148 |
if (isWindows) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2149 |
elenNTFS = 36; // NTFS, total 36 bytes |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2150 |
} else { // on unix use "ext time" |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2151 |
elenEXTT = 9; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2152 |
if (atime != -1) |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2153 |
elenEXTT += 4; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2154 |
if (ctime != -1) |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2155 |
elenEXTT += 4; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2156 |
} |
7189 | 2157 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2158 |
writeShort(os, nlen); |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2159 |
writeShort(os, elen + elen64 + elenNTFS + elenEXTT); |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2160 |
writeBytes(os, zname, 1, nlen); |
7189 | 2161 |
if (elen64 != 0) { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2162 |
writeShort(os, EXTID_ZIP64); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2163 |
writeShort(os, 16); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2164 |
writeLong(os, size); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2165 |
writeLong(os, csize); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2166 |
} |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2167 |
if (elenNTFS != 0) { |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2168 |
writeShort(os, EXTID_NTFS); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2169 |
writeShort(os, elenNTFS - 4); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2170 |
writeInt(os, 0); // reserved |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2171 |
writeShort(os, 0x0001); // NTFS attr tag |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2172 |
writeShort(os, 24); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2173 |
writeLong(os, javaToWinTime(mtime)); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2174 |
writeLong(os, javaToWinTime(atime)); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2175 |
writeLong(os, javaToWinTime(ctime)); |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2176 |
} |
7189 | 2177 |
if (elenEXTT != 0) { |
2178 |
writeShort(os, EXTID_EXTT); |
|
2179 |
writeShort(os, elenEXTT - 4);// size for the folowing data block |
|
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2180 |
int fbyte = 0x1; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2181 |
if (atime != -1) // mtime and atime |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2182 |
fbyte |= 0x2; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2183 |
if (ctime != -1) // mtime, atime and ctime |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2184 |
fbyte |= 0x4; |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2185 |
os.write(fbyte); // flags byte |
7189 | 2186 |
writeInt(os, javaToUnixTime(mtime)); |
17910
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2187 |
if (atime != -1) |
82d10099a8a6
4759491: method ZipEntry.setTime(long) works incorrectly
sherman
parents:
17699
diff
changeset
|
2188 |
writeInt(os, javaToUnixTime(atime)); |
7189 | 2189 |
if (ctime != -1) |
2190 |
writeInt(os, javaToUnixTime(ctime)); |
|
2191 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2192 |
if (extra != null) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2193 |
writeBytes(os, extra); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2194 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2195 |
return LOCHDR + nlen + elen + elen64 + elenNTFS + elenEXTT; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2196 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2197 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2198 |
// Data Descriptior |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2199 |
int writeEXT(OutputStream os) throws IOException { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2200 |
writeInt(os, EXTSIG); // EXT header signature |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2201 |
writeInt(os, crc); // crc-32 |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2202 |
if (csize >= ZIP64_MINVAL || size >= ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2203 |
writeLong(os, csize); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2204 |
writeLong(os, size); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2205 |
return 24; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2206 |
} else { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2207 |
writeInt(os, csize); // compressed size |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2208 |
writeInt(os, size); // uncompressed size |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2209 |
return 16; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2210 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2211 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2212 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2213 |
// read NTFS, UNIX and ZIP64 data from cen.extra |
7189 | 2214 |
void readExtra(ZipFileSystem zipfs) throws IOException { |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2215 |
if (extra == null) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2216 |
return; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2217 |
int elen = extra.length; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2218 |
int off = 0; |
7189 | 2219 |
int newOff = 0; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2220 |
while (off + 4 < elen) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2221 |
// extra spec: HeaderID+DataSize+Data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2222 |
int pos = off; |
7189 | 2223 |
int tag = SH(extra, pos); |
2224 |
int sz = SH(extra, pos + 2); |
|
2225 |
pos += 4; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2226 |
if (pos + sz > elen) // invalid data |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2227 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2228 |
switch (tag) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2229 |
case EXTID_ZIP64 : |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2230 |
if (size == ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2231 |
if (pos + 8 > elen) // invalid zip64 extra |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2232 |
break; // fields, just skip |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2233 |
size = LL(extra, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2234 |
pos += 8; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2235 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2236 |
if (csize == ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2237 |
if (pos + 8 > elen) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2238 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2239 |
csize = LL(extra, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2240 |
pos += 8; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2241 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2242 |
if (locoff == ZIP64_MINVAL) { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2243 |
if (pos + 8 > elen) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2244 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2245 |
locoff = LL(extra, pos); |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2246 |
pos += 8; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2247 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2248 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2249 |
case EXTID_NTFS: |
29815
a50c9d80a80f
8076641: getNextEntry throws ArrayIndexOutOfBoundsException when unzipping file
sherman
parents:
29714
diff
changeset
|
2250 |
if (sz < 32) |
a50c9d80a80f
8076641: getNextEntry throws ArrayIndexOutOfBoundsException when unzipping file
sherman
parents:
29714
diff
changeset
|
2251 |
break; |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2252 |
pos += 4; // reserved 4 bytes |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2253 |
if (SH(extra, pos) != 0x0001) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2254 |
break; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2255 |
if (SH(extra, pos + 2) != 24) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2256 |
break; |
7189 | 2257 |
// override the loc field, datatime here is |
2258 |
// more "accurate" |
|
2259 |
mtime = winToJavaTime(LL(extra, pos + 4)); |
|
2260 |
atime = winToJavaTime(LL(extra, pos + 12)); |
|
2261 |
ctime = winToJavaTime(LL(extra, pos + 20)); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2262 |
break; |
7189 | 2263 |
case EXTID_EXTT: |
2264 |
// spec says the Extened timestamp in cen only has mtime |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2265 |
// need to read the loc to get the extra a/ctime, if flag |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2266 |
// "zipinfo-time" is not specified to false; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2267 |
// there is performance cost (move up to loc and read) to |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2268 |
// access the loc table foreach entry; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2269 |
if (zipfs.noExtt) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2270 |
if (sz == 5) |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2271 |
mtime = unixToJavaTime(LG(extra, pos + 1)); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2272 |
break; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2273 |
} |
7189 | 2274 |
byte[] buf = new byte[LOCHDR]; |
2275 |
if (zipfs.readFullyAt(buf, 0, buf.length , locoff) |
|
2276 |
!= buf.length) |
|
2277 |
throw new ZipException("loc: reading failed"); |
|
29714
afac043e9bf0
8075774: Small readability and performance improvements for zipfs
martin
parents:
29270
diff
changeset
|
2278 |
if (!locSigAt(buf, 0)) |
7189 | 2279 |
throw new ZipException("loc: wrong sig ->" |
29714
afac043e9bf0
8075774: Small readability and performance improvements for zipfs
martin
parents:
29270
diff
changeset
|
2280 |
+ Long.toString(getSig(buf, 0), 16)); |
7189 | 2281 |
int locElen = LOCEXT(buf); |
2282 |
if (locElen < 9) // EXTT is at lease 9 bytes |
|
2283 |
break; |
|
2284 |
int locNlen = LOCNAM(buf); |
|
2285 |
buf = new byte[locElen]; |
|
2286 |
if (zipfs.readFullyAt(buf, 0, buf.length , locoff + LOCHDR + locNlen) |
|
2287 |
!= buf.length) |
|
2288 |
throw new ZipException("loc extra: reading failed"); |
|
2289 |
int locPos = 0; |
|
2290 |
while (locPos + 4 < buf.length) { |
|
2291 |
int locTag = SH(buf, locPos); |
|
2292 |
int locSZ = SH(buf, locPos + 2); |
|
2293 |
locPos += 4; |
|
2294 |
if (locTag != EXTID_EXTT) { |
|
2295 |
locPos += locSZ; |
|
2296 |
continue; |
|
2297 |
} |
|
43224
355457152ea8
8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
sherman
parents:
43193
diff
changeset
|
2298 |
int end = locPos + locSZ - 4; |
7189 | 2299 |
int flag = CH(buf, locPos++); |
43224
355457152ea8
8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
sherman
parents:
43193
diff
changeset
|
2300 |
if ((flag & 0x1) != 0 && locPos <= end) { |
7189 | 2301 |
mtime = unixToJavaTime(LG(buf, locPos)); |
2302 |
locPos += 4; |
|
2303 |
} |
|
43224
355457152ea8
8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
sherman
parents:
43193
diff
changeset
|
2304 |
if ((flag & 0x2) != 0 && locPos <= end) { |
7189 | 2305 |
atime = unixToJavaTime(LG(buf, locPos)); |
2306 |
locPos += 4; |
|
2307 |
} |
|
43224
355457152ea8
8173072: zipfs fails to handle incorrect info-zip "extended timestamp extra field"
sherman
parents:
43193
diff
changeset
|
2308 |
if ((flag & 0x4) != 0 && locPos <= end) { |
7189 | 2309 |
ctime = unixToJavaTime(LG(buf, locPos)); |
2310 |
locPos += 4; |
|
2311 |
} |
|
2312 |
break; |
|
2313 |
} |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2314 |
break; |
7189 | 2315 |
default: // unknown tag |
2316 |
System.arraycopy(extra, off, extra, newOff, sz + 4); |
|
2317 |
newOff += (sz + 4); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2318 |
} |
7189 | 2319 |
off += (sz + 4); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2320 |
} |
7189 | 2321 |
if (newOff != 0 && newOff != extra.length) |
2322 |
extra = Arrays.copyOf(extra, newOff); |
|
2323 |
else |
|
2324 |
extra = null; |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2325 |
} |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2326 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2327 |
///////// basic file attributes /////////// |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2328 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2329 |
public FileTime creationTime() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2330 |
return FileTime.fromMillis(ctime == -1 ? mtime : ctime); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2331 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2332 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2333 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2334 |
public boolean isDirectory() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2335 |
return isDir(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2336 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2337 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2338 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2339 |
public boolean isOther() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2340 |
return false; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2341 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2342 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2343 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2344 |
public boolean isRegularFile() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2345 |
return !isDir(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2346 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2347 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2348 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2349 |
public FileTime lastAccessTime() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2350 |
return FileTime.fromMillis(atime == -1 ? mtime : atime); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2351 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2352 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2353 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2354 |
public FileTime lastModifiedTime() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2355 |
return FileTime.fromMillis(mtime); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2356 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2357 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2358 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2359 |
public long size() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2360 |
return size; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2361 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2362 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2363 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2364 |
public boolean isSymbolicLink() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2365 |
return false; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2366 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2367 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2368 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2369 |
public Object fileKey() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2370 |
return null; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2371 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2372 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2373 |
///////// zip entry attributes /////////// |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2374 |
public long compressedSize() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2375 |
return csize; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2376 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2377 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2378 |
public long crc() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2379 |
return crc; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2380 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2381 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2382 |
public int method() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2383 |
return method; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2384 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2385 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2386 |
public byte[] extra() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2387 |
if (extra != null) |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2388 |
return Arrays.copyOf(extra, extra.length); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2389 |
return null; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2390 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2391 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2392 |
public byte[] comment() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2393 |
if (comment != null) |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2394 |
return Arrays.copyOf(comment, comment.length); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2395 |
return null; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2396 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2397 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2398 |
public String toString() { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2399 |
StringBuilder sb = new StringBuilder(1024); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2400 |
Formatter fm = new Formatter(sb); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2401 |
fm.format(" creationTime : %tc%n", creationTime().toMillis()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2402 |
fm.format(" lastAccessTime : %tc%n", lastAccessTime().toMillis()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2403 |
fm.format(" lastModifiedTime: %tc%n", lastModifiedTime().toMillis()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2404 |
fm.format(" isRegularFile : %b%n", isRegularFile()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2405 |
fm.format(" isDirectory : %b%n", isDirectory()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2406 |
fm.format(" isSymbolicLink : %b%n", isSymbolicLink()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2407 |
fm.format(" isOther : %b%n", isOther()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2408 |
fm.format(" fileKey : %s%n", fileKey()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2409 |
fm.format(" size : %d%n", size()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2410 |
fm.format(" compressedSize : %d%n", compressedSize()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2411 |
fm.format(" crc : %x%n", crc()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2412 |
fm.format(" method : %d%n", method()); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2413 |
fm.close(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2414 |
return sb.toString(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2415 |
} |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2416 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2417 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2418 |
private static class ExChannelCloser { |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2419 |
Path path; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2420 |
SeekableByteChannel ch; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2421 |
Set<InputStream> streams; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2422 |
ExChannelCloser(Path path, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2423 |
SeekableByteChannel ch, |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2424 |
Set<InputStream> streams) |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2425 |
{ |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2426 |
this.path = path; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2427 |
this.ch = ch; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2428 |
this.streams = streams; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2429 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2430 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2431 |
|
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2432 |
// ZIP directory has two issues: |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2433 |
// (1) ZIP spec does not require the ZIP file to include |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2434 |
// directory entry |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2435 |
// (2) all entries are not stored/organized in a "tree" |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2436 |
// structure. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2437 |
// A possible solution is to build the node tree ourself as |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2438 |
// implemented below. |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2439 |
private IndexNode root; |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2440 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2441 |
// default time stamp for pseudo entries |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2442 |
private long zfsDefaultTimeStamp = System.currentTimeMillis(); |
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2443 |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2444 |
private void removeFromTree(IndexNode inode) { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2445 |
IndexNode parent = inodes.get(LOOKUPKEY.as(getParent(inode.name))); |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2446 |
IndexNode child = parent.child; |
16857
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
2447 |
if (child.equals(inode)) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2448 |
parent.child = child.sibling; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2449 |
} else { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2450 |
IndexNode last = child; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2451 |
while ((child = child.sibling) != null) { |
16857
1e094a236e0e
8002390: (zipfs) Problems moving files between zip file systems
sherman
parents:
14342
diff
changeset
|
2452 |
if (child.equals(inode)) { |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2453 |
last.sibling = child.sibling; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2454 |
break; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2455 |
} else { |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2456 |
last = child; |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2457 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2458 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2459 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2460 |
} |
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2461 |
|
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2462 |
// purely for parent lookup, so we don't have to copy the parent |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2463 |
// name every time |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2464 |
static class ParentLookup extends IndexNode { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2465 |
int len; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2466 |
ParentLookup() {} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2467 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2468 |
final ParentLookup as(byte[] name, int len) { // as a lookup "key" |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2469 |
name(name, len); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2470 |
return this; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2471 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2472 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2473 |
void name(byte[] name, int len) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2474 |
this.name = name; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2475 |
this.len = len; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2476 |
// calculate the hashcode the same way as Arrays.hashCode() does |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2477 |
int result = 1; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2478 |
for (int i = 0; i < len; i++) |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2479 |
result = 31 * result + name[i]; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2480 |
this.hashcode = result; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2481 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2482 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2483 |
@Override |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2484 |
public boolean equals(Object other) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2485 |
if (!(other instanceof IndexNode)) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2486 |
return false; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2487 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2488 |
byte[] oname = ((IndexNode)other).name; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2489 |
return Arrays.equals(name, 0, len, |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2490 |
oname, 0, oname.length); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2491 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2492 |
|
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2493 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2494 |
|
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2495 |
private void buildNodeTree() throws IOException { |
7189 | 2496 |
beginWrite(); |
2497 |
try { |
|
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2498 |
IndexNode root = new IndexNode(ROOTPATH, true); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2499 |
IndexNode[] nodes = inodes.keySet().toArray(new IndexNode[0]); |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2500 |
inodes.put(root, root); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2501 |
ParentLookup lookup = new ParentLookup(); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2502 |
for (IndexNode node : nodes) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2503 |
IndexNode parent; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2504 |
while (true) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2505 |
int off = getParentOff(node.name); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2506 |
if (off <= 1) { // parent is root |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2507 |
node.sibling = root.child; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2508 |
root.child = node; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2509 |
break; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2510 |
} |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2511 |
lookup = lookup.as(node.name, off); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2512 |
if (inodes.containsKey(lookup)) { |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2513 |
parent = inodes.get(lookup); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2514 |
node.sibling = parent.child; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2515 |
parent.child = node; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2516 |
break; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2517 |
} |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2518 |
// add new pseudo directory entry |
43193
a8e490921d20
8172921: Zip filesystem performance improvement and code cleanup
sherman
parents:
38769
diff
changeset
|
2519 |
parent = new IndexNode(Arrays.copyOf(node.name, off), true); |
37803
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2520 |
inodes.put(parent, parent); |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2521 |
node.sibling = parent.child; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2522 |
parent.child = node; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2523 |
node = parent; |
ac955d7f5271
8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents:
34835
diff
changeset
|
2524 |
} |
8005
5bc99c45810a
7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
sherman
parents:
7531
diff
changeset
|
2525 |
} |
7189 | 2526 |
} finally { |
2527 |
endWrite(); |
|
6699
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2528 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2529 |
} |
d8229570529d
6990846: Demo: NIO.2 filesystem provider for zip/jar archives
sherman
parents:
diff
changeset
|
2530 |
} |