mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-24 09:03:26 +01:00
34a82e7629
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.
125 lines
2.8 KiB
C
125 lines
2.8 KiB
C
/* $OpenBSD$ */
|
|
|
|
/*
|
|
* Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include "tmux.h"
|
|
|
|
/*
|
|
* Sources a configuration file.
|
|
*/
|
|
|
|
int cmd_source_file_parse(struct cmd *, int, char **, char **);
|
|
int cmd_source_file_exec(struct cmd *, struct cmd_ctx *);
|
|
void cmd_source_file_free(struct cmd *);
|
|
void cmd_source_file_init(struct cmd *, int);
|
|
size_t cmd_source_file_print(struct cmd *, char *, size_t);
|
|
|
|
struct cmd_source_file_data {
|
|
char *path;
|
|
};
|
|
|
|
const struct cmd_entry cmd_source_file_entry = {
|
|
"source-file", "source",
|
|
"path",
|
|
0, 0,
|
|
cmd_source_file_init,
|
|
cmd_source_file_parse,
|
|
cmd_source_file_exec,
|
|
cmd_source_file_free,
|
|
cmd_source_file_print
|
|
};
|
|
|
|
void
|
|
cmd_source_file_init(struct cmd *self, unused int arg)
|
|
{
|
|
struct cmd_source_file_data *data;
|
|
|
|
self->data = data = xmalloc(sizeof *data);
|
|
data->path = NULL;
|
|
}
|
|
|
|
int
|
|
cmd_source_file_parse(struct cmd *self, int argc, char **argv, char **cause)
|
|
{
|
|
struct cmd_source_file_data *data;
|
|
int opt;
|
|
|
|
self->entry->init(self, 0);
|
|
data = self->data;
|
|
|
|
while ((opt = getopt(argc, argv, "")) != -1) {
|
|
switch (opt) {
|
|
default:
|
|
goto usage;
|
|
}
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
if (argc != 1)
|
|
goto usage;
|
|
|
|
data->path = xstrdup(argv[0]);
|
|
return (0);
|
|
|
|
usage:
|
|
xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
|
|
|
|
self->entry->free(self);
|
|
return (-1);
|
|
}
|
|
|
|
int
|
|
cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|
{
|
|
struct cmd_source_file_data *data = self->data;
|
|
char *cause;
|
|
|
|
if (load_cfg(data->path, &cause) != 0) {
|
|
ctx->error(ctx, "%s", cause);
|
|
xfree(cause);
|
|
return (-1);
|
|
}
|
|
|
|
return (0);
|
|
}
|
|
|
|
void
|
|
cmd_source_file_free(struct cmd *self)
|
|
{
|
|
struct cmd_source_file_data *data = self->data;
|
|
|
|
if (data->path != NULL)
|
|
xfree(data->path);
|
|
xfree(data);
|
|
}
|
|
|
|
size_t
|
|
cmd_source_file_print(struct cmd *self, char *buf, size_t len)
|
|
{
|
|
struct cmd_source_file_data *data = self->data;
|
|
size_t off = 0;
|
|
|
|
off += xsnprintf(buf, len, "%s", self->entry->name);
|
|
if (data == NULL)
|
|
return (off);
|
|
if (off < len && data->path != NULL)
|
|
off += cmd_prarg(buf + off, len - off, " ", data->path);
|
|
return (off);
|
|
}
|