summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-server-info.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-08-11 17:18:36 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-08-11 17:18:36 +0000
commit935b5746db4dbaa64a95e16e092ba253ec4313c0 (patch)
tree16726ba9f3830ab0a0c9fe91057a200f38455835 /usr.bin/tmux/cmd-server-info.c
parent98b05a003a84406b2feccb22b9cd67bae0c215c7 (diff)
Switch tmux to use imsg. This is the last major change to make the
client-server protocol more resilient and make the protocol versioning work properly. In future, the only things requiring a protocol version bump will be changes in the message structs, and (when both client and server have this change) mixing different versions should nicely report an error message. As a side effect this also makes the code tidier, fixes a problem with the way errors reported during server startup were handled, and supports fd passing (which will be used in future). Looked over by eric@, thanks. Please note that mixing a client with this change with an older server or vice versa may cause tmux to crash or hang - tmux should be completely exited before upgrading.
Diffstat (limited to 'usr.bin/tmux/cmd-server-info.c')
-rw-r--r--usr.bin/tmux/cmd-server-info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-server-info.c b/usr.bin/tmux/cmd-server-info.c
index 189bde3b2f9..2785d951429 100644
--- a/usr.bin/tmux/cmd-server-info.c
+++ b/usr.bin/tmux/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-server-info.c,v 1.6 2009/08/08 13:29:27 nicm Exp $ */
+/* $OpenBSD: cmd-server-info.c,v 1.7 2009/08/11 17:18:35 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -90,7 +90,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
continue;
ctx->print(ctx, "%2d: %s (%d, %d): %s [%ux%u %s] "
- "[flags=0x%x/0x%x]", i, c->tty.path, c->fd, c->tty.fd,
+ "[flags=0x%x/0x%x]", i, c->tty.path, c->ibuf.fd, c->tty.fd,
c->session->name, c->tty.sx, c->tty.sy, c->tty.termname,
c->flags, c->tty.flags);
}