diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-14 21:04:04 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-14 21:04:04 +0000 |
| commit | a9b6bfdddd570753e52dca73169f70864502c38c (patch) | |
| tree | bc259ba79ba2ddddd5579857ccaad69eef5d55d4 /cmd-server-info.c | |
| parent | a604dfbb979c994ee7fb068416e0b60c95ce2198 (diff) | |
| download | rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.tar.gz rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.tar.bz2 rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.zip | |
Sync OpenBSD patchset 243:
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 'cmd-server-info.c')
| -rw-r--r-- | cmd-server-info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-server-info.c b/cmd-server-info.c index f0c5fff4..3955ed75 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -1,4 +1,4 @@ -/* $Id: cmd-server-info.c,v 1.24 2009-08-09 17:28:23 tcunha Exp $ */ +/* $Id: cmd-server-info.c,v 1.25 2009-08-14 21:04:04 tcunha 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); } |