stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8207395: jar has issues with UNC-path arguments for the jar -C parameter [windows]

Browse Source 
Reviewed-by: goetz, sherman
This commit is contained in:
Matthias Baesken 2018-07-19 11:04:46 +02:00
parent ad816a0809
commit 198715ae97
1 changed files with 6 additions and 1 deletions

7
src/jdk.jartool/share/classes/sun/tools/jar/Main.java

@ -633,10 +633,15 @@ public class Main {
dir = (dir.endsWith(File.separator) ?
dir : (dir + File.separator));
dir = dir.replace(File.separatorChar, '/');
boolean hasUNC = (File.separatorChar == '\\'&& dir.startsWith("//"));
while (dir.indexOf("//") > -1) {
dir = dir.replace("//", "/");
}
pathsMap.get(version).add(dir.replace(File.separatorChar, '/'));
if (hasUNC) { // Restore Windows UNC path.
dir = "/" + dir;
}
pathsMap.get(version).add(dir);
nameBuf[k++] = dir + args[++i];
} else if (args[i].startsWith("--release")) {
int v = BASE_VERSION;