circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2013-11-14 07:51:26 +00:00
parent 2c08a3a559 7624800ddc
commit 3e498cdb49
9 changed files with 150 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server-client.c
View File

@ -155,8 +155,8 @@ server_client_lost(struct client *c)
free(c->ttyname);
free(c->term);
evbuffer_free (c->stdin_data);
evbuffer_free (c->stdout_data);
evbuffer_free(c->stdin_data);
evbuffer_free(c->stdout_data);
if (c->stderr_data != c->stdout_data)
evbuffer_free (c->stderr_data);
@ -222,7 +222,8 @@ server_client_callback(int fd, short events, void *data)
return;
if (fd == c->ibuf.fd) {
if (events & EV_WRITE && msgbuf_write(&c->ibuf.w) < 0)
if (events & EV_WRITE && msgbuf_write(&c->ibuf.w) < 0 &&
errno != EAGAIN)
goto client_lost;
if (c->flags & CLIENT_BAD) {
@ -932,7 +933,10 @@ server_client_msg_command(struct client *c, struct imsg *imsg)
}
cmd_free_argv(argc, argv);
cmdq_run(c->cmdq, cmdlist);
if (c != cfg_client || cfg_finished)
cmdq_run(c->cmdq, cmdlist);
else
cmdq_append(c->cmdq, cmdlist);
cmd_list_free(cmdlist);
return;