From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 30 Jul 2018 18:57:22 +0000 (+0200)
Subject: ptyfwd: when we can't copy the window size from caller, use $LINES and $COLUMNS
X-Git-Tag: v240~605
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da22bdbc05c0014a0ceb6a14352c30fc2ae277c3;p=thirdparty%2Fsystemd.git

ptyfwd: when we can't copy the window size from caller, use $LINES and $COLUMNS

This way users can directly influence the tty size if they like when
nspawn is invoked as a service and thus stdin/stdout/stderr are not
connected to a TTY.
---

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 942c3f31dc9..1cb7ea3a197 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -20,6 +20,7 @@
 #include "log.h"
 #include "macro.h"
 #include "ptyfwd.h"
+#include "terminal-util.h"
 #include "time-util.h"
 
 struct PTYForward {
@@ -421,8 +422,17 @@ int pty_forward_new(
 
         f->master = master;
 
-        if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
-                (void) ioctl(master, TIOCSWINSZ, &ws);
+        if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) < 0) {
+                /* If we can't get the resolution from the output fd, then use our internal, regular width/height,
+                 * i.e. something derived from $COLUMNS and $LINES if set. */
+
+                ws = (struct winsize) {
+                        .ws_row = lines(),
+                        .ws_col = columns(),
+                };
+        }
+
+        (void) ioctl(master, TIOCSWINSZ, &ws);
 
         if (!(flags & PTY_FORWARD_READ_ONLY)) {
                 if (tcgetattr(STDIN_FILENO, &f->saved_stdin_attr) >= 0) {