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

7175845: jar uf changes file permissions unexpectedly

Browse Source 
7177216: native2ascii changes file permissions of input file

Undo the File.createTempFile change in jar and native2ascii

Reviewed-by: asaha
This commit is contained in:
Xueming Shen 2012-06-28 22:44:21 -07:00
parent fed8efa873
commit 57b8661095
4 changed files with 178 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/sun/tools/jar/Main.java
View File

@ -137,7 +137,7 @@ class Main {
File dir = file.getParentFile();
if (dir == null)
dir = new File(".");
return Files.createTempFile(dir.toPath(), "jartmp", null).toFile();
return File.createTempFile("jartmp", null, dir);
}
private boolean ok;

8
jdk/src/share/classes/sun/tools/native2ascii/Main.java
View File

@ -241,7 +241,9 @@ public class Main {
if (tempDir == null)
tempDir = new File(System.getProperty("user.dir"));
tempFile = Files.createTempFile(tempDir.toPath(), "_N2A", ".TMP").toFile();
tempFile = File.createTempFile("_N2A",
".TMP",
tempDir);
tempFile.deleteOnExit();
try {
@ -291,7 +293,9 @@ public class Main {
File tempDir = f.getParentFile();
if (tempDir == null)
tempDir = new File(System.getProperty("user.dir"));
tempFile = Files.createTempFile(tempDir.toPath(), "_N2A", ".TMP").toFile();
tempFile = File.createTempFile("_N2A",
".TMP",
tempDir);
tempFile.deleteOnExit();
try {

85
jdk/test/sun/tools/native2ascii/Permission.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 7177216
* @summary resulting file of native2ascii should have normal permission
*/
import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.*;
import sun.tools.native2ascii.Main;
public class Permission {
private static void cleanup(String... fnames) throws Throwable {
for (String fname : fnames) {
Files.deleteIfExists(Paths.get(fname));
}
}
public static void realMain(String[] args) throws Throwable {
if (!System.getProperty("os.name").startsWith("Windows")) {
String src = "native2ascii_permtest_src";
String dst = "native2ascii_permtest_dst";
cleanup(src, dst);
try {
try (FileOutputStream fos = new FileOutputStream(src)) {
fos.write('a'); fos.write('b'); fos.write('c');
}
String[] n2aArgs = new String[] {"-encoding", "utf8", src, dst};
if (!new Main().convert(n2aArgs)) {
fail("n2a failed.");
}
equal(Files.getPosixFilePermissions(Paths.get(src)),
Files.getPosixFilePermissions(Paths.get(dst)));
String[] a2nArgs = new String[] {"-reverse", "-encoding", "utf8", dst, src};
if (!new Main().convert(a2nArgs)) {
fail("a2n failed.");
}
equal(Files.getPosixFilePermissions(Paths.get(src)),
Files.getPosixFilePermissions(Paths.get(dst)));
} finally {
cleanup(src, dst);
}
}
}
//--------------------- Infrastructure ---------------------------
static volatile int passed = 0, failed = 0;
static void pass() {passed++;}
static void fail() {failed++; Thread.dumpStack();}
static void fail(String msg) {System.out.println(msg); fail();}
static void unexpected(Throwable t) {failed++; t.printStackTrace();}
static void check(boolean cond) {if (cond) pass(); else fail();}
static void equal(Object x, Object y) {
if (x == null ? y == null : x.equals(y)) pass();
else fail(x + " not equal to " + y);}
public static void main(String[] args) throws Throwable {
try {realMain(args);} catch (Throwable t) {unexpected(t);}
System.out.println("\nPassed = " + passed + " failed = " + failed);
if (failed > 0) throw new AssertionError("Some tests failed");}
}

86
jdk/test/tools/jar/UpdateJar.java Normal file
View File

@ -0,0 +1,86 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 7175845
* @summary jar -uf should not change file permission
*/
import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.*;
import java.util.Set;
import sun.tools.jar.Main;
public class UpdateJar {
private static void cleanup(String... fnames) throws Throwable {
for (String fname : fnames) {
Files.deleteIfExists(Paths.get(fname));
}
}
public static void realMain(String[] args) throws Throwable {
if (!System.getProperty("os.name").startsWith("Windows")) {
String jar = "testUpdateJar.jar";
String e0 = "testUpdateJar_entry0.txt";
String e1 = "testUpdateJar_entry1.txt";
cleanup(jar, e0, e1);
try {
try (FileOutputStream fos0 = new FileOutputStream(e0);
FileOutputStream fos1 = new FileOutputStream(e1)) {
fos0.write(0);
fos1.write(0);
}
String[] jarArgs = new String[] {"cfM0", jar, e0};
if (!new Main(System.out, System.err, "jar").run(jarArgs)) {
fail("Could not create jar file.");
}
Set<PosixFilePermission> pm = Files.getPosixFilePermissions(Paths.get(jar));
jarArgs = new String[] {"uf", jar, e1};
if (!new Main(System.out, System.err, "jar").run(jarArgs)) {
fail("Could not create jar file.");
}
equal(pm, Files.getPosixFilePermissions(Paths.get(jar)));
} finally {
cleanup(jar, e0, e1);
}
}
}
//--------------------- Infrastructure ---------------------------
static volatile int passed = 0, failed = 0;
static void pass() {passed++;}
static void fail() {failed++; Thread.dumpStack();}
static void fail(String msg) {System.out.println(msg); fail();}
static void unexpected(Throwable t) {failed++; t.printStackTrace();}
static void check(boolean cond) {if (cond) pass(); else fail();}
static void equal(Object x, Object y) {
if (x == null ? y == null : x.equals(y)) pass();
else fail(x + " not equal to " + y);}
public static void main(String[] args) throws Throwable {
try {realMain(args);} catch (Throwable t) {unexpected(t);}
System.out.println("\nPassed = " + passed + " failed = " + failed);
if (failed > 0) throw new AssertionError("Some tests failed");}
}