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

Don't hang when window closes early; also add lots more debugging.

Browse Source
This commit is contained in:
Nicholas Marriott
2008-05-31 20:04:15 +00:00
parent abe745f991
commit 5569ff9723
7 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client.c
View File

@ -1,4 +1,4 @@
/* $Id: client.c,v 1.25 2007-12-06 09:46:21 nicm Exp $ */
/* $Id: client.c,v 1.26 2008-05-31 20:04:15 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -130,6 +130,19 @@ client_main(struct client_ctx *cctx)
if (sigwinch)
client_handle_winch(cctx);
switch (client_msg_dispatch(cctx, &error)) {
case -1:
goto out;
case 0:
/* May be more in buffer, don't let poll block. */
timeout = 0;
break;
default:
/* Out of data, poll may block. */
timeout = INFTIM;
break;
}
pfd.fd = cctx->srv_fd;
pfd.events = POLLIN;
if (BUFFER_USED(cctx->srv_out) > 0)
@ -143,19 +156,6 @@ client_main(struct client_ctx *cctx)
if (buffer_poll(&pfd, cctx->srv_in, cctx->srv_out) != 0)
goto server_dead;
switch (client_msg_dispatch(cctx, &error)) {
case -1:
goto out;
case 0:
/* May be more in buffer, don't let poll block. */
timeout = 0;
break;
default:
/* Out of data, poll may block. */
timeout = INFTIM;
break;
}
}
out: