chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
559a4d4
)
ptyfwd: Set the size of the PTY base on the size of stdout, not stdin.
author
Luke Shumaker
<LukeShu@sbcglobal.net>
Sat, 23 Nov 2013 09:57:42 +0000
(
04:57
-0500)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 11 Dec 2013 01:01:40 +0000
(
01:01
+0000)
src/shared/ptyfwd.c
patch
|
blob
|
history
diff --git
a/src/shared/ptyfwd.c
b/src/shared/ptyfwd.c
index 7225b933ff35a7f3146e13e9a537132311f052f9..85a0ddc2ecbe3b866b2913e09909b0293da60533 100644
(file)
--- a/
src/shared/ptyfwd.c
+++ b/
src/shared/ptyfwd.c
@@
-305,7
+305,7
@@
static int process_pty_loop(int master, sigset_t *mask, pid_t kill_pid, int sign
struct winsize ws;
/* The window size changed, let's forward that. */
struct winsize ws;
/* The window size changed, let's forward that. */
- if (ioctl(STD
IN
_FILENO, TIOCGWINSZ, &ws) >= 0)
+ if (ioctl(STD
OUT
_FILENO, TIOCGWINSZ, &ws) >= 0)
ioctl(master, TIOCSWINSZ, &ws);
} else if (sfsi.ssi_signo == SIGTERM && kill_pid > 0 && signo > 0 && !tried_orderly_shutdown) {
ioctl(master, TIOCSWINSZ, &ws);
} else if (sfsi.ssi_signo == SIGTERM && kill_pid > 0 && signo > 0 && !tried_orderly_shutdown) {
@@
-346,7
+346,7
@@
int process_pty(int master, sigset_t *mask, pid_t kill_pid, int signo) {
struct winsize ws;
int r;
struct winsize ws;
int r;
- if (ioctl(STD
IN
_FILENO, TIOCGWINSZ, &ws) >= 0)
+ if (ioctl(STD
OUT
_FILENO, TIOCGWINSZ, &ws) >= 0)
ioctl(master, TIOCSWINSZ, &ws);
if (tcgetattr(STDIN_FILENO, &saved_attr) >= 0) {
ioctl(master, TIOCSWINSZ, &ws);
if (tcgetattr(STDIN_FILENO, &saved_attr) >= 0) {