circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-06 03:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-07-13 18:01:09 +01:00
parent 38d4d69639 e45d624df2
commit 07aef38591
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

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