Trim some code by moving the ioctl(TIOCGWINSZ) after SIGWINCH from the client

into the server.

This is another (the second of four) protocol version changes coming this
morning, so again the server should be killed before upgrading.

1 files changed, 21 insertions, 0 deletions

diff --git a/tty.c b/tty.c
index 574e9a7b..12535f94 100644
--- a/tty.c
+++ b/tty.c
@@ -73,6 +73,27 @@ tty_init(struct tty *tty, int fd, char *term)
 	tty->term_flags = 0;
 }
 
+void
+tty_resize(struct tty *tty)
+{
+	struct winsize	ws;
+
+	if (ioctl(tty->fd, TIOCGWINSZ, &ws) != -1) {
+		tty->sx = ws.ws_col;
+		tty->sy = ws.ws_row;
+	}
+	if (tty->sx == 0)
+		tty->sx = 80;
+	if (tty->sy == 0)
+		tty->sy = 24;
+
+	tty->cx = UINT_MAX;
+	tty->cy = UINT_MAX;
+
+	tty->rupper = UINT_MAX;
+	tty->rlower = UINT_MAX;
+}
+
 int
 tty_open(struct tty *tty, const char *overrides, char **cause)
 {