initial commit

Author: naotoj

src/java.base/share/classes/java/io/Console.java

@@ -614,27 +614,12 @@ 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"),
+                                  Charset.forName(StaticProperty.nativeEncoding(),
+                                                  Charset.defaultCharset()));
 
         cons = instantiateConsole();
 

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;
-}

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);
-}

test/jdk/java/io/Console/DefaultCharsetTest.java

@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8341975
+ * @summary Tests the default charset. It should honor `stdout.encoding`
+ *          which should be the same as System.out.charset()
+ * @run main/othervm -Dstdout.encoding=UTF-8 DefaultCharsetTest UTF-8
+ * @run main/othervm -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest ISO-8859-1
+ * @run main/othervm -Dstdout.encoding=US-ASCII DefaultCharsetTest US-ASCII
+ * @run main/othervm -Dstdout.encoding=foo DefaultCharsetTest foo
+ * @run main/othervm DefaultCharsetTest (none)
+ */
+public class DefaultCharsetTest {
+    public static void main(String... args) {
+        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(args[0], sysoutCharset.name(), consoleCharset.name()));
+        if (!sysoutCharset.equals(consoleCharset)) {
+            throw new RuntimeException("Charsets for System.out and Console differ.");
+        }
+    }
+}