diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-07-13 18:01:09 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-07-13 18:01:09 +0100 |
| commit | 07aef385910f46e09804756231ff1ef3e304e023 (patch) | |
| tree | 934330dfd6943a981ee7a935aa8d818a9ccfadd4 /server-client.c | |
| parent | 38d4d696391123da266c9d38ed65bba7076e1147 (diff) | |
| parent | e45d624df288d914a1628d373ff245b03f7d600b (diff) | |
| download | rtmux-07aef385910f46e09804756231ff1ef3e304e023.tar.gz rtmux-07aef385910f46e09804756231ff1ef3e304e023.tar.bz2 rtmux-07aef385910f46e09804756231ff1ef3e304e023.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index c9c0c3ef..59969618 100644 --- a/server-client.c +++ b/server-client.c @@ -95,6 +95,8 @@ server_client_create(int fd) environ_init(&c->environ); + c->cwd = -1; + c->cmdq = cmdq_new(c); c->cmdq->client_exit = 1; @@ -1267,12 +1269,11 @@ server_client_msg_identify(struct client *c, struct imsg *imsg) if (c->fd == -1) return; - if (!isatty(c->fd)) { + if (tty_init(&c->tty, c, c->fd, c->term) != 0) { close(c->fd); c->fd = -1; return; } - tty_init(&c->tty, c, c->fd, c->term); if (c->flags & CLIENT_UTF8) c->tty.flags |= TTY_UTF8; if (c->flags & CLIENT_256COLOURS) |