From 76dcfc723a899535763249783e2c9103b14af966 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Mon, 14 Oct 2024 13:02:13 -0700 Subject: [PATCH] initial commit --- .../share/classes/java/io/Console.java | 21 +------- .../unix/native/libjava/Console_md.c | 8 +-- .../windows/native/libjava/Console_md.c | 16 +----- .../java/io/Console/DefaultCharsetTest.java | 52 +++++++++++++++++++ 4 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 test/jdk/java/io/Console/DefaultCharsetTest.java diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java index 0aa12bdf4c8b5..e32f5b6d2e83d 100644 --- a/src/java.base/share/classes/java/io/Console.java +++ b/src/java.base/share/classes/java/io/Console.java @@ -34,7 +34,7 @@ import jdk.internal.io.JdkConsoleImpl; import jdk.internal.io.JdkConsoleProvider; import jdk.internal.javac.PreviewFeature; -import jdk.internal.util.StaticProperty; +import sun.nio.cs.UTF_8; import sun.security.action.GetPropertyAction; /** @@ -614,27 +614,10 @@ private static UnsupportedOperationException newUnsupportedOperationException() "Console class itself does not provide implementation"); } - private static native String encoding(); private static final boolean istty = istty(); static final Charset CHARSET; static { - Charset cs = null; - - if (istty) { - String csname = encoding(); - if (csname == null) { - csname = GetPropertyAction.privilegedGetProperty("stdout.encoding"); - } - if (csname != null) { - cs = Charset.forName(csname, null); - } - } - if (cs == null) { - cs = Charset.forName(StaticProperty.nativeEncoding(), - Charset.defaultCharset()); - } - - CHARSET = cs; + CHARSET = Charset.forName(GetPropertyAction.privilegedGetProperty("stdout.encoding"), UTF_8.INSTANCE); cons = instantiateConsole(); diff --git a/src/java.base/unix/native/libjava/Console_md.c b/src/java.base/unix/native/libjava/Console_md.c index e5b760a149972..1e71ab3a6b20a 100644 --- a/src/java.base/unix/native/libjava/Console_md.c +++ b/src/java.base/unix/native/libjava/Console_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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 @@ -36,9 +36,3 @@ Java_java_io_Console_istty(JNIEnv *env, jclass cls) { return isatty(fileno(stdin)) && isatty(fileno(stdout)); } - -JNIEXPORT jstring JNICALL -Java_java_io_Console_encoding(JNIEnv *env, jclass cls) -{ - return NULL; -} diff --git a/src/java.base/windows/native/libjava/Console_md.c b/src/java.base/windows/native/libjava/Console_md.c index 9423f7d9e318f..f73e62f8e2603 100644 --- a/src/java.base/windows/native/libjava/Console_md.c +++ b/src/java.base/windows/native/libjava/Console_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, 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 @@ -49,17 +49,3 @@ Java_java_io_Console_istty(JNIEnv *env, jclass cls) return JNI_TRUE; } - -JNIEXPORT jstring JNICALL -Java_java_io_Console_encoding(JNIEnv *env, jclass cls) -{ - char buf[64]; - int cp = GetConsoleCP(); - if (cp >= 874 && cp <= 950) - snprintf(buf, sizeof(buf), "ms%d", cp); - else if (cp == 65001) - snprintf(buf, sizeof(buf), "UTF-8"); - else - snprintf(buf, sizeof(buf), "cp%d", cp); - return JNU_NewStringPlatform(env, buf); -} diff --git a/test/jdk/java/io/Console/DefaultCharsetTest.java b/test/jdk/java/io/Console/DefaultCharsetTest.java new file mode 100644 index 0000000000000..7b6710b5ccb5c --- /dev/null +++ b/test/jdk/java/io/Console/DefaultCharsetTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2024, 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. + */ + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +/** + * @test + * @bug 8341975 + * @summary Tests the default charset. It should honor `stdout.encoding` + * which should be the same as System.out.charset() + * @run junit/othervm -Dstdout.encoding=UTF-8 DefaultCharsetTest + * @run junit/othervm -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest + * @run junit/othervm -Dstdout.encoding=US-ASCII DefaultCharsetTest + * @run junit/othervm -Dstdout.encoding=foo DefaultCharsetTest + * @run junit/othervm DefaultCharsetTest + */ +public class DefaultCharsetTest { + @Test + public void testDefaultCharset() { + var stdoutEncoding = System.getProperty("stdout.encoding"); + var sysoutCharset = System.out.charset(); + var consoleCharset = System.console().charset(); + System.out.println(""" + stdout.encoding = %s + System.out.charset() = %s + System.console().charset() = %s + """.formatted(stdoutEncoding, sysoutCharset.name(), consoleCharset.name())); + assertEquals(consoleCharset, sysoutCharset, + "Charsets for System.out and Console differ for stdout.encoding: %s".formatted(stdoutEncoding)); + } +}