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

8289689: (fs) Re-examine the need for normalization to Unicode Normalization Format D (macOS)

Browse Source 
Reviewed-by: jpai, alanb
This commit is contained in:
Brian Burkhalter 2022-11-03 15:47:51 +00:00
parent b7442d12e2
commit 25dfcbdea5
3 changed files with 48 additions and 15 deletions
src/java.base/macosx/classes/sun/nio/fs
MacOSXFileSystem.java
test/jdk/java/nio/file/Path
MacPath.javaMacPathTest.java

35
src/java.base/macosx/classes/sun/nio/fs/MacOSXFileSystem.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2022, 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
@ -26,6 +26,7 @@
package sun.nio.fs;
import java.util.regex.Pattern;
import sun.security.action.GetPropertyAction;
import static sun.nio.fs.MacOSXNativeDispatcher.*;
@ -35,6 +36,18 @@ import static sun.nio.fs.MacOSXNativeDispatcher.*;
class MacOSXFileSystem extends BsdFileSystem {
private static final String PROPERTY_NORMALIZE_FILE_PATHS =
"jdk.nio.path.useNormalizationFormD";
private static final boolean NORMALIZE_FILE_PATHS;
static {
final String name = PROPERTY_NORMALIZE_FILE_PATHS;
String value = GetPropertyAction.privilegedGetProperty(name);
NORMALIZE_FILE_PATHS = (value != null)
&& ("".equals(value) || Boolean.parseBoolean(value));
}
MacOSXFileSystem(UnixFileSystemProvider provider, String dir) {
super(provider, dir);
}
@ -46,21 +59,25 @@ class MacOSXFileSystem extends BsdFileSystem {
@Override
String normalizeNativePath(String path) {
for (int i = 0; i < path.length(); i++) {
char c = path.charAt(i);
if (c > 0x80)
return new String(normalizepath(path.toCharArray(),
if (NORMALIZE_FILE_PATHS) {
for (int i = 0; i < path.length(); i++) {
char c = path.charAt(i);
if (c > 0x80)
return new String(normalizepath(path.toCharArray(),
kCFStringNormalizationFormD));
}
}
return path;
}
@Override
String normalizeJavaPath(String path) {
for (int i = 0; i < path.length(); i++) {
if (path.charAt(i) > 0x80)
return new String(normalizepath(path.toCharArray(),
kCFStringNormalizationFormC));
if (NORMALIZE_FILE_PATHS) {
for (int i = 0; i < path.length(); i++) {
if (path.charAt(i) > 0x80)
return new String(normalizepath(path.toCharArray(),
kCFStringNormalizationFormC));
}
}
return path;
}

11
test/jdk/java/nio/file/Path/MacPath.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2022, 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
@ -27,10 +27,13 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.text.Normalizer;
import java.text.Normalizer.Form;
import java.util.Set;
import java.util.regex.Pattern;
public class MacPath {
private static final String PROPERTY_NORMALIZE_FILE_PATHS =
"jdk.nio.path.useNormalizationFormD";
public static void main(String args[]) throws Throwable {
System.out.printf("sun.jnu.encoding=%s, file.encoding=%s%n",
@ -81,8 +84,10 @@ public class MacPath {
throws Throwable
{
String fname = null;
String dname_nfd = Normalizer.normalize(dname, Normalizer.Form.NFD);
String fname_nfd = Normalizer.normalize(fname_nfc, Normalizer.Form.NFD);
Normalizer.Form form = Boolean.getBoolean(PROPERTY_NORMALIZE_FILE_PATHS)
? Normalizer.Form.NFD : Normalizer.Form.NFC;
String dname_nfd = Normalizer.normalize(dname, form);
String fname_nfd = Normalizer.normalize(fname_nfc, form);
System.out.printf("%n%n--------Testing...----------%n");
Path bpath = Paths.get(testdir);

17
test/jdk/java/nio/file/Path/MacPathTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2022, 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
@ -22,7 +22,7 @@
*/
/* @test
* @bug 7130915
* @bug 7130915 8289689
* @summary Tests file path with nfc/nfd forms on MacOSX
* @requires (os.family == "mac")
* @library /test/lib ..
@ -34,14 +34,25 @@
* jdk.test.lib.process.*
* TestUtil MacPath
* @run main MacPathTest
* @run main/othervm -Djdk.nio.path.useNormalizationFormD=true MacPathTest
*/
import jdk.test.lib.process.ProcessTools;
public class MacPathTest {
private static final String PROPERTY_NORMALIZE_FILE_PATHS =
"jdk.nio.path.useNormalizationFormD";
private static final boolean NORMALIZE_FILE_PATHS =
Boolean.getBoolean(PROPERTY_NORMALIZE_FILE_PATHS);
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createTestJvm(MacPath.class.getName());
ProcessBuilder pb;
if (NORMALIZE_FILE_PATHS) {
String option = "-D" + PROPERTY_NORMALIZE_FILE_PATHS + "=true";
pb = ProcessTools.createTestJvm(option, MacPath.class.getName());
} else {
pb = ProcessTools.createTestJvm(MacPath.class.getName());
}
pb.environment().put("LC_ALL", "en_US.UTF-8");
ProcessTools.executeProcess(pb)
.outputTo(System.out)