diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-08-11 21:28:11 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-08-11 21:28:11 +0000 |
| commit | 4310282a4c52f1885ae2eb80b106c9c03564a0b8 (patch) | |
| tree | 21099e70cdd49e4dc08084bbd758e64677728774 /server-msg.c | |
| parent | 4ec8ade11c23eec4b652cdd7ea47ddf346b7be93 (diff) | |
| download | rtmux-4310282a4c52f1885ae2eb80b106c9c03564a0b8.tar.gz rtmux-4310282a4c52f1885ae2eb80b106c9c03564a0b8.tar.bz2 rtmux-4310282a4c52f1885ae2eb80b106c9c03564a0b8.zip | |
Have the client pass its stdin fd to the server when identifying itself and
have the server use that rather than reopening the tty. If the fd isn't given,
use the old behaviour (so no need for a version change).
This allows tmux to be used as the shell, so also change so that when working
out the command to execute if default-command is empty (the default), tmux will
try not execute itself.
Diffstat (limited to 'server-msg.c')
| -rw-r--r-- | server-msg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server-msg.c b/server-msg.c index 3e82f90a..286e8bdc 100644 --- a/server-msg.c +++ b/server-msg.c @@ -27,7 +27,7 @@ #include "tmux.h" void server_msg_command(struct client *, struct msg_command_data *); -void server_msg_identify(struct client *, struct msg_identify_data *); +void server_msg_identify(struct client *, struct msg_identify_data *, int); void server_msg_resize(struct client *, struct msg_resize_data *); void printflike2 server_msg_command_error(struct cmd_ctx *, const char *, ...); @@ -76,7 +76,7 @@ server_msg_dispatch(struct client *c) fatalx("bad MSG_IDENTIFY size"); memcpy(&identifydata, imsg.data, sizeof identifydata); - server_msg_identify(c, &identifydata); + server_msg_identify(c, &identifydata, imsg.fd); break; case MSG_RESIZE: if (datalen != sizeof resizedata) @@ -235,7 +235,7 @@ error: } void -server_msg_identify(struct client *c, struct msg_identify_data *data) +server_msg_identify(struct client *c, struct msg_identify_data *data, int fd) { c->tty.sx = data->sx; c->tty.sy = data->sy; @@ -247,7 +247,7 @@ server_msg_identify(struct client *c, struct msg_identify_data *data) data->tty[(sizeof data->tty) - 1] = '\0'; data->term[(sizeof data->term) - 1] = '\0'; - tty_init(&c->tty, data->tty, data->term); + tty_init(&c->tty, fd, data->tty, data->term); if (data->flags & IDENTIFY_UTF8) c->tty.flags |= TTY_UTF8; if (data->flags & IDENTIFY_256COLOURS) |