archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8298971: Move Console implementation into jdk internal package

Browse source 
Reviewed-by: jpai
This commit is contained in:
Naoto Sato 2022-12-21 18:09:21 +00:00
parent 10d62fa218
commit 7e59a0ecb6
4 changed files with 99 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/java.base/unix/native/libjava/Console_md.c
View file

@ -27,11 +27,9 @@
#include "jni_util.h"
#include "jvm.h"
#include "java_io_Console.h"
#include "java_io_ConsoleImpl.h"
#include <stdlib.h>
#include <unistd.h>
#include <termios.h>
JNIEXPORT jboolean JNICALL
Java_java_io_Console_istty(JNIEnv *env, jclass cls)
@ -44,27 +42,3 @@ Java_java_io_Console_encoding(JNIEnv *env, jclass cls)
{
return NULL;
}
JNIEXPORT jboolean JNICALL
Java_java_io_ConsoleImpl_echo(JNIEnv *env,
jclass cls,
jboolean on)
{
struct termios tio;
jboolean old;
int tty = fileno(stdin);
if (tcgetattr(tty, &tio) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "tcgetattr failed");
return !on;
}
old = (tio.c_lflag & ECHO) != 0;
if (on) {
tio.c_lflag |= ECHO;
} else {
tio.c_lflag &= ~ECHO;
}
if (tcsetattr(tty, TCSANOW, &tio) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "tcsetattr failed");
}
return old;
}

57
src/java.base/unix/native/libjava/JdkConsoleImpl_md.c Normal file
View file

@ -0,0 +1,57 @@
/*
* Copyright (c) 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
#include "jdk_internal_io_JdkConsoleImpl.h"
#include <stdlib.h>
#include <unistd.h>
#include <termios.h>
JNIEXPORT jboolean JNICALL
Java_jdk_internal_io_JdkConsoleImpl_echo(JNIEnv *env,
jclass cls,
jboolean on)
{
struct termios tio;
jboolean old;
int tty = fileno(stdin);
if (tcgetattr(tty, &tio) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "tcgetattr failed");
return !on;
}
old = (tio.c_lflag & ECHO) != 0;
if (on) {
tio.c_lflag |= ECHO;
} else {
tio.c_lflag &= ~ECHO;
}
if (tcsetattr(tty, TCSANOW, &tio) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "tcsetattr failed");
}
return old;
}