summaryrefslogtreecommitdiffstats
path: root/cmd-send-keys.c
diff options
context:
space:
mode:
authortcunha <tcunha>2009-07-28 22:12:16 +0000
committertcunha <tcunha>2009-07-28 22:12:16 +0000
commitad1947baaf8f2449eeda751dc7e9e88b6c44db41 (patch)
tree7ee5a6194f659307baa7cdbe56e0605c9fe86bbd /cmd-send-keys.c
parent012e86d5e4fdeae7a2c0dc911059a170902a6e96 (diff)
downloadtmux-old-ad1947baaf8f2449eeda751dc7e9e88b6c44db41.tar.gz
tmux-old-ad1947baaf8f2449eeda751dc7e9e88b6c44db41.tar.bz2
tmux-old-ad1947baaf8f2449eeda751dc7e9e88b6c44db41.zip
Sync OpenBSD patchset 181:
Make all messages sent between the client and server fixed size. This is the first of two changes to make the protocol more resilient and less sensitive to other changes in the code, particularly with commands. The client now packs argv into a buffer and sends it to the server for parsing, rather than doing it itself and sending the parsed command data. As a side-effect this also removes a lot of now-unused command marshalling code. Mixing a server without this change and a client with or vice versa will cause tmux to hang or crash, please ensure that tmux is entirely killed before upgrading.
Diffstat (limited to 'cmd-send-keys.c')
-rw-r--r--cmd-send-keys.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index 3c7be60b..1e46cbc6 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -28,8 +28,6 @@
int cmd_send_keys_parse(struct cmd *, int, char **, char **);
int cmd_send_keys_exec(struct cmd *, struct cmd_ctx *);
-void cmd_send_keys_send(struct cmd *, struct buffer *);
-void cmd_send_keys_recv(struct cmd *, struct buffer *);
void cmd_send_keys_free(struct cmd *);
size_t cmd_send_keys_print(struct cmd *, char *, size_t);
@@ -47,8 +45,6 @@ const struct cmd_entry cmd_send_keys_entry = {
NULL,
cmd_send_keys_parse,
cmd_send_keys_exec,
- cmd_send_keys_send,
- cmd_send_keys_recv,
cmd_send_keys_free,
cmd_send_keys_print
};
@@ -128,28 +124,6 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
}
void
-cmd_send_keys_send(struct cmd *self, struct buffer *b)
-{
- struct cmd_send_keys_data *data = self->data;
-
- buffer_write(b, data, sizeof *data);
- cmd_send_string(b, data->target);
- buffer_write(b, data->keys, data->nkeys * sizeof *data->keys);
-}
-
-void
-cmd_send_keys_recv(struct cmd *self, struct buffer *b)
-{
- struct cmd_send_keys_data *data;
-
- self->data = data = xmalloc(sizeof *data);
- buffer_read(b, data, sizeof *data);
- data->target = cmd_recv_string(b);
- data->keys = xcalloc(data->nkeys, sizeof *data->keys);
- buffer_read(b, data->keys, data->nkeys * sizeof *data->keys);
-}
-
-void
cmd_send_keys_free(struct cmd *self)
{
struct cmd_send_keys_data *data = self->data;