aboutsummaryrefslogtreecommitdiff
path: root/cmd-attach-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-04-25 10:02:46 +0000
committerThomas Adam <thomas@xteddy.org>2015-04-25 10:02:46 +0000
commit56e1132db485aeb0730ce7782533ca441e63afef (patch)
tree310f172893f10f8f2f3a249ee88fed51b03b39cc /cmd-attach-session.c
parent0a88377086329786c438d4973365fdb21186f4e4 (diff)
parentaeedb464a6ee038289ddcfefae437928ab020cb1 (diff)
downloadrtmux-56e1132db485aeb0730ce7782533ca441e63afef.tar.gz
rtmux-56e1132db485aeb0730ce7782533ca441e63afef.tar.bz2
rtmux-56e1132db485aeb0730ce7782533ca441e63afef.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-attach-session.c')
-rw-r--r--cmd-attach-session.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index a67ec82c..79e14616 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -51,7 +51,6 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
struct window_pane *wp = NULL;
const char *update;
char *cause;
- u_int i;
int fd;
struct format_tree *ft;
char *cp;
@@ -92,11 +91,8 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
* Can't use server_write_session in case attaching to
* the same session as currently attached to.
*/
- for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
- c = ARRAY_ITEM(&clients, i);
- if (c == NULL || c->session != s)
- continue;
- if (c == cmdq->client)
+ TAILQ_FOREACH(c, &clients, entry) {
+ if (c->session != s || c == cmdq->client)
continue;
server_write_client(c, MSG_DETACH,
c->session->name,