SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ptyfwd: don't reset TTY twice if stdin/stdout point to same TTY

Browse Source 
And in particular don't save/restore an already reset TTY state.
This commit is contained in:
Lennart Poettering
2023-11-24 11:00:52 +01:00
parent 7b3bbb1038
commit 1b6983b395
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ptyfwd.c
+14 -4
View File
@@ -22,6 +22,7 @@
#include "log.h"
#include "macro.h"
#include "ptyfwd.h"
#include "stat-util.h"
#include "terminal-util.h"
#include "time-util.h"
@@ -477,8 +478,14 @@ int pty_forward_new(
(void) ioctl(master, TIOCSWINSZ, &ws);
if (!(flags & PTY_FORWARD_READ_ONLY)) {
int same;
assert(f->input_fd >= 0);
same = inode_same_at(f->input_fd, NULL, f->output_fd, NULL, AT_EMPTY_PATH);
if (same < 0)
return same;
if (tcgetattr(f->input_fd, &f->saved_stdin_attr) >= 0) {
struct termios raw_stdin_attr;
@@ -486,11 +493,14 @@ int pty_forward_new(
raw_stdin_attr = f->saved_stdin_attr;
cfmakeraw(&raw_stdin_attr);
raw_stdin_attr.c_oflag = f->saved_stdin_attr.c_oflag;
tcsetattr(f->input_fd, TCSANOW, &raw_stdin_attr);
if (!same)
raw_stdin_attr.c_oflag = f->saved_stdin_attr.c_oflag;
(void) tcsetattr(f->input_fd, TCSANOW, &raw_stdin_attr);
}
if (tcgetattr(f->output_fd, &f->saved_stdout_attr) >= 0) {
if (!same && tcgetattr(f->output_fd, &f->saved_stdout_attr) >= 0) {
struct termios raw_stdout_attr;
f->saved_stdout = true;
@@ -499,7 +509,7 @@ int pty_forward_new(
cfmakeraw(&raw_stdout_attr);
raw_stdout_attr.c_iflag = f->saved_stdout_attr.c_iflag;
raw_stdout_attr.c_lflag = f->saved_stdout_attr.c_lflag;
tcsetattr(f->output_fd, TCSANOW, &raw_stdout_attr);
(void) tcsetattr(f->output_fd, TCSANOW, &raw_stdout_attr);
}
r = sd_event_add_io(f->event, &f->stdin_event_source, f->input_fd, EPOLLIN|EPOLLET, on_stdin_event, f);