author | ohair |
Wed, 06 Apr 2011 22:06:11 -0700 | |
changeset 9035 | 1255eb81cc2f |
parent 8553 | 46c2babb1e44 |
permissions | -rw-r--r-- |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
1 |
/* |
9035
1255eb81cc2f
7033660: Update copyright year to 2011 on any files changed in 2011
ohair
parents:
8553
diff
changeset
|
2 |
* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
4 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
10 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
15 |
* accompanied this code). |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
16 |
* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
20 |
* |
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
24 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
25 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
26 |
import java.io.*; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
27 |
import java.nio.charset.Charset; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
28 |
import java.util.*; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
29 |
import java.util.zip.*; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
30 |
import java.text.MessageFormat; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
31 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
32 |
/** |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
33 |
* A stripped-down version of Jar tool with a "-encoding" option to |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
34 |
* support non-UTF8 encoidng for entry name and comment. |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
35 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
36 |
public class zip { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
37 |
String program; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
38 |
PrintStream out, err; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
39 |
String fname; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
40 |
String zname = ""; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
41 |
String[] files; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
42 |
Charset cs = Charset.forName("UTF-8"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
43 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
44 |
Map<String, File> entryMap = new HashMap<String, File>(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
45 |
Set<File> entries = new LinkedHashSet<File>(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
46 |
List<String> paths = new ArrayList<String>(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
47 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
48 |
CRC32 crc32 = new CRC32(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
49 |
/* |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
50 |
* cflag: create |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
51 |
* uflag: update |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
52 |
* xflag: xtract |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
53 |
* tflag: table |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
54 |
* vflag: verbose |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
55 |
* flag0: no zip compression (store only) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
56 |
*/ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
57 |
boolean cflag, uflag, xflag, tflag, vflag, flag0; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
58 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
59 |
private static ResourceBundle rsrc; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
60 |
static { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
61 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
62 |
// just use the jar message |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
63 |
rsrc = ResourceBundle.getBundle("sun.tools.jar.resources.jar"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
64 |
} catch (MissingResourceException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
65 |
throw new Error("Fatal: Resource for jar is missing"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
66 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
67 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
68 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
69 |
public zip(PrintStream out, PrintStream err, String program) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
70 |
this.out = out; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
71 |
this.err = err; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
72 |
this.program = program; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
73 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
74 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
75 |
private boolean ok; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
76 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
77 |
public synchronized boolean run(String args[]) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
78 |
ok = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
79 |
if (!parseArgs(args)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
80 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
81 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
82 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
83 |
if (cflag || uflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
84 |
if (fname != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
85 |
zname = fname.replace(File.separatorChar, '/'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
86 |
if (zname.startsWith("./")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
87 |
zname = zname.substring(2); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
88 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
89 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
90 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
91 |
if (cflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
92 |
OutputStream out; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
93 |
if (fname != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
94 |
out = new FileOutputStream(fname); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
95 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
96 |
out = new FileOutputStream(FileDescriptor.out); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
97 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
98 |
vflag = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
99 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
100 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
101 |
expand(null, files, false); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
102 |
create(new BufferedOutputStream(out, 4096)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
103 |
out.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
104 |
} else if (uflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
105 |
File inputFile = null, tmpFile = null; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
106 |
FileInputStream in; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
107 |
FileOutputStream out; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
108 |
if (fname != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
109 |
inputFile = new File(fname); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
110 |
String path = inputFile.getParent(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
111 |
tmpFile = File.createTempFile("tmp", null, |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
112 |
new File((path == null) ? "." : path)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
113 |
in = new FileInputStream(inputFile); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
114 |
out = new FileOutputStream(tmpFile); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
115 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
116 |
in = new FileInputStream(FileDescriptor.in); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
117 |
out = new FileOutputStream(FileDescriptor.out); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
118 |
vflag = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
119 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
120 |
expand(null, files, true); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
121 |
boolean updateOk = update(in, new BufferedOutputStream(out)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
122 |
if (ok) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
123 |
ok = updateOk; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
124 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
125 |
in.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
126 |
out.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
127 |
if (fname != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
128 |
inputFile.delete(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
129 |
if (!tmpFile.renameTo(inputFile)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
130 |
tmpFile.delete(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
131 |
throw new IOException(getMsg("error.write.file")); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
132 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
133 |
tmpFile.delete(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
134 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
135 |
} else if (tflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
136 |
replaceFSC(files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
137 |
if (fname != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
138 |
list(fname, files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
139 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
140 |
InputStream in = new FileInputStream(FileDescriptor.in); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
141 |
try{ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
142 |
list(new BufferedInputStream(in), files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
143 |
} finally { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
144 |
in.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
145 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
146 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
147 |
} else if (xflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
148 |
replaceFSC(files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
149 |
if (fname != null && files != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
150 |
extract(fname, files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
151 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
152 |
InputStream in = (fname == null) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
153 |
? new FileInputStream(FileDescriptor.in) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
154 |
: new FileInputStream(fname); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
155 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
156 |
extract(new BufferedInputStream(in), files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
157 |
} finally { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
158 |
in.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
159 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
160 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
161 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
162 |
} catch (IOException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
163 |
fatalError(e); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
164 |
ok = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
165 |
} catch (Error ee) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
166 |
ee.printStackTrace(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
167 |
ok = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
168 |
} catch (Throwable t) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
169 |
t.printStackTrace(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
170 |
ok = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
171 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
172 |
out.flush(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
173 |
err.flush(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
174 |
return ok; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
175 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
176 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
177 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
178 |
boolean parseArgs(String args[]) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
179 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
180 |
args = parse(args); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
181 |
} catch (FileNotFoundException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
182 |
fatalError(formatMsg("error.cant.open", e.getMessage())); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
183 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
184 |
} catch (IOException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
185 |
fatalError(e); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
186 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
187 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
188 |
int count = 1; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
189 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
190 |
String flags = args[0]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
191 |
if (flags.startsWith("-")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
192 |
flags = flags.substring(1); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
193 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
194 |
for (int i = 0; i < flags.length(); i++) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
195 |
switch (flags.charAt(i)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
196 |
case 'c': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
197 |
if (xflag || tflag || uflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
198 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
199 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
200 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
201 |
cflag = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
202 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
203 |
case 'u': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
204 |
if (cflag || xflag || tflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
205 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
206 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
207 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
208 |
uflag = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
209 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
210 |
case 'x': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
211 |
if (cflag || uflag || tflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
212 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
213 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
214 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
215 |
xflag = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
216 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
217 |
case 't': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
218 |
if (cflag || uflag || xflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
219 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
220 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
221 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
222 |
tflag = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
223 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
224 |
case 'v': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
225 |
vflag = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
226 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
227 |
case 'f': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
228 |
fname = args[count++]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
229 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
230 |
case '0': |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
231 |
flag0 = true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
232 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
233 |
default: |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
234 |
error(formatMsg("error.illegal.option", |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
235 |
String.valueOf(flags.charAt(i)))); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
236 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
237 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
238 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
239 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
240 |
} catch (ArrayIndexOutOfBoundsException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
241 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
242 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
243 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
244 |
if (!cflag && !tflag && !xflag && !uflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
245 |
error(getMsg("error.bad.option")); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
246 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
247 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
248 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
249 |
/* parse file arguments */ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
250 |
int n = args.length - count; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
251 |
if (n > 0) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
252 |
int k = 0; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
253 |
String[] nameBuf = new String[n]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
254 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
255 |
for (int i = count; i < args.length; i++) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
256 |
if (args[i].equals("-encoding")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
257 |
cs = Charset.forName(args[++i]); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
258 |
} else if (args[i].equals("-C")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
259 |
/* change the directory */ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
260 |
String dir = args[++i]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
261 |
dir = (dir.endsWith(File.separator) ? |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
262 |
dir : (dir + File.separator)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
263 |
dir = dir.replace(File.separatorChar, '/'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
264 |
while (dir.indexOf("//") > -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
265 |
dir = dir.replace("//", "/"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
266 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
267 |
paths.add(dir.replace(File.separatorChar, '/')); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
268 |
nameBuf[k++] = dir + args[++i]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
269 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
270 |
nameBuf[k++] = args[i]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
271 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
272 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
273 |
} catch (ArrayIndexOutOfBoundsException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
274 |
e.printStackTrace(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
275 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
276 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
277 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
278 |
if (k != 0) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
279 |
files = new String[k]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
280 |
System.arraycopy(nameBuf, 0, files, 0, k); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
281 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
282 |
} else if (cflag || uflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
283 |
error(getMsg("error.bad.uflag")); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
284 |
usageError(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
285 |
return false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
286 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
287 |
return true; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
288 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
289 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
290 |
void expand(File dir, String[] files, boolean isUpdate) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
291 |
if (files == null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
292 |
return; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
293 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
294 |
for (int i = 0; i < files.length; i++) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
295 |
File f; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
296 |
if (dir == null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
297 |
f = new File(files[i]); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
298 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
299 |
f = new File(dir, files[i]); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
300 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
301 |
if (f.isFile()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
302 |
if (entries.add(f)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
303 |
if (isUpdate) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
304 |
entryMap.put(entryName(f.getPath()), f); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
305 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
306 |
} else if (f.isDirectory()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
307 |
if (entries.add(f)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
308 |
if (isUpdate) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
309 |
String dirPath = f.getPath(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
310 |
dirPath = (dirPath.endsWith(File.separator)) ? dirPath : |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
311 |
(dirPath + File.separator); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
312 |
entryMap.put(entryName(dirPath), f); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
313 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
314 |
expand(f, f.list(), isUpdate); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
315 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
316 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
317 |
error(formatMsg("error.nosuch.fileordir", String.valueOf(f))); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
318 |
ok = false; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
319 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
320 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
321 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
322 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
323 |
void create(OutputStream out) throws IOException |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
324 |
{ |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
325 |
try (ZipOutputStream zos = new ZipOutputStream(out, cs)) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
326 |
if (flag0) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
327 |
zos.setMethod(ZipOutputStream.STORED); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
328 |
} |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
329 |
for (File file: entries) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
330 |
addFile(zos, file); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
331 |
} |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
332 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
333 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
334 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
335 |
boolean update(InputStream in, OutputStream out) throws IOException |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
336 |
{ |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
337 |
try (ZipInputStream zis = new ZipInputStream(in, cs); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
338 |
ZipOutputStream zos = new ZipOutputStream(out, cs)) |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
339 |
{ |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
340 |
ZipEntry e = null; |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
341 |
byte[] buf = new byte[1024]; |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
342 |
int n = 0; |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
343 |
boolean updateOk = true; |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
344 |
|
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
345 |
// put the old entries first, replace if necessary |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
346 |
while ((e = zis.getNextEntry()) != null) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
347 |
String name = e.getName(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
348 |
if (!entryMap.containsKey(name)) { // copy the old stuff |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
349 |
// do our own compression |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
350 |
ZipEntry e2 = new ZipEntry(name); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
351 |
e2.setMethod(e.getMethod()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
352 |
e2.setTime(e.getTime()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
353 |
e2.setComment(e.getComment()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
354 |
e2.setExtra(e.getExtra()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
355 |
if (e.getMethod() == ZipEntry.STORED) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
356 |
e2.setSize(e.getSize()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
357 |
e2.setCrc(e.getCrc()); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
358 |
} |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
359 |
zos.putNextEntry(e2); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
360 |
while ((n = zis.read(buf, 0, buf.length)) != -1) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
361 |
zos.write(buf, 0, n); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
362 |
} |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
363 |
} else { // replace with the new files |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
364 |
File f = entryMap.get(name); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
365 |
addFile(zos, f); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
366 |
entryMap.remove(name); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
367 |
entries.remove(f); |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
368 |
} |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
369 |
} |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
370 |
|
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
371 |
// add the remaining new files |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
372 |
for (File f: entries) { |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
373 |
addFile(zos, f); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
374 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
375 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
376 |
return updateOk; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
377 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
378 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
379 |
private String entryName(String name) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
380 |
name = name.replace(File.separatorChar, '/'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
381 |
String matchPath = ""; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
382 |
for (String path : paths) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
383 |
if (name.startsWith(path) && (path.length() > matchPath.length())) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
384 |
matchPath = path; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
385 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
386 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
387 |
name = name.substring(matchPath.length()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
388 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
389 |
if (name.startsWith("/")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
390 |
name = name.substring(1); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
391 |
} else if (name.startsWith("./")) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
392 |
name = name.substring(2); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
393 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
394 |
return name; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
395 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
396 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
397 |
void addFile(ZipOutputStream zos, File file) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
398 |
String name = file.getPath(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
399 |
boolean isDir = file.isDirectory(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
400 |
if (isDir) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
401 |
name = name.endsWith(File.separator) ? name : |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
402 |
(name + File.separator); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
403 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
404 |
name = entryName(name); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
405 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
406 |
if (name.equals("") || name.equals(".") || name.equals(zname)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
407 |
return; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
408 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
409 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
410 |
long size = isDir ? 0 : file.length(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
411 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
412 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
413 |
out.print(formatMsg("out.adding", name)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
414 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
415 |
ZipEntry e = new ZipEntry(name); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
416 |
e.setTime(file.lastModified()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
417 |
if (size == 0) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
418 |
e.setMethod(ZipEntry.STORED); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
419 |
e.setSize(0); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
420 |
e.setCrc(0); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
421 |
} else if (flag0) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
422 |
e.setSize(size); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
423 |
e.setMethod(ZipEntry.STORED); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
424 |
crc32File(e, file); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
425 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
426 |
zos.putNextEntry(e); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
427 |
if (!isDir) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
428 |
byte[] buf = new byte[8192]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
429 |
int len; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
430 |
InputStream is = new BufferedInputStream(new FileInputStream(file)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
431 |
while ((len = is.read(buf, 0, buf.length)) != -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
432 |
zos.write(buf, 0, len); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
433 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
434 |
is.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
435 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
436 |
zos.closeEntry(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
437 |
/* report how much compression occurred. */ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
438 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
439 |
size = e.getSize(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
440 |
long csize = e.getCompressedSize(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
441 |
out.print(formatMsg2("out.size", String.valueOf(size), |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
442 |
String.valueOf(csize))); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
443 |
if (e.getMethod() == ZipEntry.DEFLATED) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
444 |
long ratio = 0; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
445 |
if (size != 0) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
446 |
ratio = ((size - csize) * 100) / size; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
447 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
448 |
output(formatMsg("out.deflated", String.valueOf(ratio))); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
449 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
450 |
output(getMsg("out.stored")); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
451 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
452 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
453 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
454 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
455 |
private void crc32File(ZipEntry e, File f) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
456 |
InputStream is = new BufferedInputStream(new FileInputStream(f)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
457 |
byte[] buf = new byte[8192]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
458 |
crc32.reset(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
459 |
int r = 0; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
460 |
int nread = 0; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
461 |
long len = f.length(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
462 |
while ((r = is.read(buf)) != -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
463 |
nread += r; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
464 |
crc32.update(buf, 0, r); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
465 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
466 |
is.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
467 |
if (nread != (int) len) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
468 |
throw new ZipException(formatMsg( |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
469 |
"error.incorrect.length", f.getPath())); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
470 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
471 |
e.setCrc(crc32.getValue()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
472 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
473 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
474 |
void replaceFSC(String files[]) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
475 |
if (files != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
476 |
for (String file : files) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
477 |
file = file.replace(File.separatorChar, '/'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
478 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
479 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
480 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
481 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
482 |
Set<ZipEntry> newDirSet() { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
483 |
return new HashSet<ZipEntry>() { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
484 |
public boolean add(ZipEntry e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
485 |
return (e == null || super.add(e)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
486 |
}}; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
487 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
488 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
489 |
void updateLastModifiedTime(Set<ZipEntry> zes) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
490 |
for (ZipEntry ze : zes) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
491 |
long lastModified = ze.getTime(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
492 |
if (lastModified != -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
493 |
File f = new File(ze.getName().replace('/', File.separatorChar)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
494 |
f.setLastModified(lastModified); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
495 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
496 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
497 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
498 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
499 |
void extract(InputStream in, String files[]) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
500 |
ZipInputStream zis = new ZipInputStream(in, cs); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
501 |
ZipEntry e; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
502 |
Set<ZipEntry> dirs = newDirSet(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
503 |
while ((e = zis.getNextEntry()) != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
504 |
if (files == null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
505 |
dirs.add(extractFile(zis, e)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
506 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
507 |
String name = e.getName(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
508 |
for (String file : files) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
509 |
if (name.startsWith(file)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
510 |
dirs.add(extractFile(zis, e)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
511 |
break; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
512 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
513 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
514 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
515 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
516 |
updateLastModifiedTime(dirs); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
517 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
518 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
519 |
void extract(String fname, String files[]) throws IOException { |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
520 |
try (ZipFile zf = new ZipFile(fname, cs)) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
521 |
Set<ZipEntry> dirs = newDirSet(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
522 |
Enumeration<? extends ZipEntry> zes = zf.entries(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
523 |
while (zes.hasMoreElements()) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
524 |
ZipEntry e = zes.nextElement(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
525 |
InputStream is; |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
526 |
if (files == null) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
527 |
dirs.add(extractFile(zf.getInputStream(e), e)); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
528 |
} else { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
529 |
String name = e.getName(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
530 |
for (String file : files) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
531 |
if (name.startsWith(file)) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
532 |
dirs.add(extractFile(zf.getInputStream(e), e)); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
533 |
break; |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
534 |
} |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
535 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
536 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
537 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
538 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
539 |
updateLastModifiedTime(dirs); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
540 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
541 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
542 |
ZipEntry extractFile(InputStream is, ZipEntry e) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
543 |
ZipEntry rc = null; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
544 |
String name = e.getName(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
545 |
File f = new File(e.getName().replace('/', File.separatorChar)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
546 |
if (e.isDirectory()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
547 |
if (f.exists()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
548 |
if (!f.isDirectory()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
549 |
throw new IOException(formatMsg("error.create.dir", |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
550 |
f.getPath())); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
551 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
552 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
553 |
if (!f.mkdirs()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
554 |
throw new IOException(formatMsg("error.create.dir", |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
555 |
f.getPath())); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
556 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
557 |
rc = e; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
558 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
559 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
560 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
561 |
output(formatMsg("out.create", name)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
562 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
563 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
564 |
if (f.getParent() != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
565 |
File d = new File(f.getParent()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
566 |
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
567 |
throw new IOException(formatMsg( |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
568 |
"error.create.dir", d.getPath())); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
569 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
570 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
571 |
OutputStream os = new FileOutputStream(f); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
572 |
byte[] b = new byte[8192]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
573 |
int len; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
574 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
575 |
while ((len = is.read(b, 0, b.length)) != -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
576 |
os.write(b, 0, len); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
577 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
578 |
} finally { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
579 |
if (is instanceof ZipInputStream) |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
580 |
((ZipInputStream)is).closeEntry(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
581 |
else |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
582 |
is.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
583 |
os.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
584 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
585 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
586 |
if (e.getMethod() == ZipEntry.DEFLATED) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
587 |
output(formatMsg("out.inflated", name)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
588 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
589 |
output(formatMsg("out.extracted", name)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
590 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
591 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
592 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
593 |
long lastModified = e.getTime(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
594 |
if (lastModified != -1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
595 |
f.setLastModified(lastModified); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
596 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
597 |
return rc; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
598 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
599 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
600 |
void list(InputStream in, String files[]) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
601 |
ZipInputStream zis = new ZipInputStream(in, cs); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
602 |
ZipEntry e; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
603 |
while ((e = zis.getNextEntry()) != null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
604 |
zis.closeEntry(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
605 |
printEntry(e, files); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
606 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
607 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
608 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
609 |
void list(String fname, String files[]) throws IOException { |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
610 |
try (ZipFile zf = new ZipFile(fname, cs)) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
611 |
Enumeration<? extends ZipEntry> zes = zf.entries(); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
612 |
while (zes.hasMoreElements()) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
613 |
printEntry(zes.nextElement(), files); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5506
diff
changeset
|
614 |
} |
2592
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
615 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
616 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
617 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
618 |
void printEntry(ZipEntry e, String[] files) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
619 |
if (files == null) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
620 |
printEntry(e); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
621 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
622 |
String name = e.getName(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
623 |
for (String file : files) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
624 |
if (name.startsWith(file)) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
625 |
printEntry(e); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
626 |
return; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
627 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
628 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
629 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
630 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
631 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
632 |
void printEntry(ZipEntry e) throws IOException { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
633 |
if (vflag) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
634 |
StringBuilder sb = new StringBuilder(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
635 |
String s = Long.toString(e.getSize()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
636 |
for (int i = 6 - s.length(); i > 0; --i) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
637 |
sb.append(' '); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
638 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
639 |
sb.append(s).append(' ').append(new Date(e.getTime()).toString()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
640 |
sb.append(' ').append(e.getName()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
641 |
output(sb.toString()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
642 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
643 |
output(e.getName()); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
644 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
645 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
646 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
647 |
void usageError() { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
648 |
error( |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
649 |
"Usage: zip {ctxu}[vf0] [zip-file] [-encoding encname][-C dir] files ...\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
650 |
"Options:\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
651 |
" -c create new archive\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
652 |
" -t list table of contents for archive\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
653 |
" -x extract named (or all) files from archive\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
654 |
" -u update existing archive\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
655 |
" -v generate verbose output on standard output\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
656 |
" -f specify archive file name\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
657 |
" -0 store only; use no ZIP compression\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
658 |
" -C change to the specified directory and include the following file\n" + |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
659 |
"If any file is a directory then it is processed recursively.\n"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
660 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
661 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
662 |
void fatalError(Exception e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
663 |
e.printStackTrace(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
664 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
665 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
666 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
667 |
void fatalError(String s) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
668 |
error(program + ": " + s); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
669 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
670 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
671 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
672 |
protected void output(String s) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
673 |
out.println(s); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
674 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
675 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
676 |
protected void error(String s) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
677 |
err.println(s); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
678 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
679 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
680 |
private String getMsg(String key) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
681 |
try { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
682 |
return (rsrc.getString(key)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
683 |
} catch (MissingResourceException e) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
684 |
throw new Error("Error in message file"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
685 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
686 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
687 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
688 |
private String formatMsg(String key, String arg) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
689 |
String msg = getMsg(key); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
690 |
String[] args = new String[1]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
691 |
args[0] = arg; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
692 |
return MessageFormat.format(msg, (Object[]) args); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
693 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
694 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
695 |
private String formatMsg2(String key, String arg, String arg1) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
696 |
String msg = getMsg(key); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
697 |
String[] args = new String[2]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
698 |
args[0] = arg; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
699 |
args[1] = arg1; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
700 |
return MessageFormat.format(msg, (Object[]) args); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
701 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
702 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
703 |
public static String[] parse(String[] args) throws IOException |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
704 |
{ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
705 |
ArrayList<String> newArgs = new ArrayList<String>(args.length); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
706 |
for (int i = 0; i < args.length; i++) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
707 |
String arg = args[i]; |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
708 |
if (arg.length() > 1 && arg.charAt(0) == '@') { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
709 |
arg = arg.substring(1); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
710 |
if (arg.charAt(0) == '@') { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
711 |
newArgs.add(arg); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
712 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
713 |
loadCmdFile(arg, newArgs); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
714 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
715 |
} else { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
716 |
newArgs.add(arg); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
717 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
718 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
719 |
return newArgs.toArray(new String[newArgs.size()]); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
720 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
721 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
722 |
private static void loadCmdFile(String name, List<String> args) throws IOException |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
723 |
{ |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
724 |
Reader r = new BufferedReader(new FileReader(name)); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
725 |
StreamTokenizer st = new StreamTokenizer(r); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
726 |
st.resetSyntax(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
727 |
st.wordChars(' ', 255); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
728 |
st.whitespaceChars(0, ' '); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
729 |
st.commentChar('#'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
730 |
st.quoteChar('"'); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
731 |
st.quoteChar('\''); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
732 |
while (st.nextToken() != st.TT_EOF) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
733 |
args.add(st.sval); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
734 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
735 |
r.close(); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
736 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
737 |
|
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
738 |
public static void main(String args[]) { |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
739 |
zip z = new zip(System.out, System.err, "zip"); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
740 |
System.exit(z.run(args) ? 0 : 1); |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
741 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
742 |
} |
ef26f663a2ba
4244499: ZipEntry() does not convert filenames from Unicode to platform
sherman
parents:
diff
changeset
|
743 |