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.
This commit is contained in:
Nicholas Marriott
2009-09-23 06:12:58 +00:00
parent 64caf59e84
commit 962fa20b36
4 changed files with 33 additions and 62 deletions

21
tty.c
View File

@ -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)
{