TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-08 04:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix line editing on Android 8.0+

Browse Source
This commit is contained in:
vvb2060 2021-07-23 13:47:10 +08:00 committed by John Wu
parent 117d1ed080
commit 34bcb1dd26
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
native/jni/su/pts.cpp
View File

@ -127,28 +127,23 @@ static int stdin_is_raw = 0;
* on failure -1, and errno is set * on failure -1, and errno is set
* on success 0 * on success 0
*/ */
int set_stdin_raw(void) { int set_stdin_raw() {
struct termios new_termios; struct termios termios{};
// Save the current stdin termios if (tcgetattr(STDIN_FILENO, &termios) < 0) {
if (tcgetattr(STDIN_FILENO, &old_stdin) < 0) {
return -1; return -1;
} }
// Start from the current settings old_stdin = termios;
new_termios = old_stdin;
// Make the terminal like an SSH or telnet client cfmakeraw(&termios);
new_termios.c_iflag |= IGNPAR;
new_termios.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
new_termios.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
new_termios.c_oflag &= ~OPOST;
new_termios.c_cc[VMIN] = 1;
new_termios.c_cc[VTIME] = 0;
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &new_termios) < 0) { if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &termios) < 0) {
// https://blog.zhanghai.me/fixing-line-editing-on-android-8-0/
if (tcsetattr(STDIN_FILENO, TCSADRAIN, &termios) < 0) {
return -1; return -1;
} }
}
stdin_is_raw = 1; stdin_is_raw = 1;
@ -168,12 +163,14 @@ int set_stdin_raw(void) {
* on failure, -1 and errno is set * on failure, -1 and errno is set
* on success, 0 * on success, 0
*/ */
int restore_stdin(void) { int restore_stdin() {
if (!stdin_is_raw) return 0; if (!stdin_is_raw) return 0;
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &old_stdin) < 0) { if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &old_stdin) < 0) {
if (tcsetattr(STDIN_FILENO, TCSADRAIN, &old_stdin) < 0) {
return -1; return -1;
} }
}
stdin_is_raw = 0; stdin_is_raw = 0;