mirror of
https://github.com/tmate-io/tmate.git
synced 2025-08-19 09:52:06 +02:00
Big reorganisation of command-line syntax.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-attach-session.c,v 1.17 2008-06-05 17:12:10 nicm Exp $ */
|
||||
/* $Id: cmd-attach-session.c,v 1.18 2008-06-05 21:25:00 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@@ -26,89 +26,32 @@
|
||||
* Attach existing session to the current terminal.
|
||||
*/
|
||||
|
||||
int cmd_attach_session_parse(struct cmd *, int, char **, char **);
|
||||
void cmd_attach_session_exec(struct cmd *, struct cmd_ctx *);
|
||||
void cmd_attach_session_send(struct cmd *, struct buffer *);
|
||||
void cmd_attach_session_recv(struct cmd *, struct buffer *);
|
||||
void cmd_attach_session_free(struct cmd *);
|
||||
void cmd_attach_session_print(struct cmd *, char *, size_t);
|
||||
|
||||
struct cmd_attach_session_data {
|
||||
char *cname;
|
||||
char *sname;
|
||||
int flag_detach;
|
||||
};
|
||||
|
||||
const struct cmd_entry cmd_attach_session_entry = {
|
||||
"attach-session", "attach",
|
||||
"[-d] [-c client-tty|-s session-name]",
|
||||
CMD_CANTNEST,
|
||||
cmd_attach_session_parse,
|
||||
"[-d] " CMD_TARGET_SESSION_USAGE,
|
||||
CMD_DFLAG|CMD_CANTNEST,
|
||||
cmd_target_init,
|
||||
cmd_target_parse,
|
||||
cmd_attach_session_exec,
|
||||
cmd_attach_session_send,
|
||||
cmd_attach_session_recv,
|
||||
cmd_attach_session_free,
|
||||
NULL,
|
||||
cmd_attach_session_print
|
||||
cmd_target_send,
|
||||
cmd_target_recv,
|
||||
cmd_target_free,
|
||||
cmd_target_print
|
||||
};
|
||||
|
||||
int
|
||||
cmd_attach_session_parse(struct cmd *self, int argc, char **argv, char **cause)
|
||||
{
|
||||
struct cmd_attach_session_data *data;
|
||||
int opt;
|
||||
|
||||
self->data = data = xmalloc(sizeof *data);
|
||||
data->cname = NULL;
|
||||
data->sname = NULL;
|
||||
data->flag_detach = 0;
|
||||
|
||||
while ((opt = getopt(argc, argv, "c:ds:")) != EOF) {
|
||||
switch (opt) {
|
||||
case 'c':
|
||||
if (data->sname != NULL)
|
||||
goto usage;
|
||||
if (data->cname == NULL)
|
||||
data->cname = xstrdup(optarg);
|
||||
break;
|
||||
case 'd':
|
||||
data->flag_detach = 1;
|
||||
break;
|
||||
case 's':
|
||||
if (data->cname != NULL)
|
||||
goto usage;
|
||||
if (data->sname == NULL)
|
||||
data->sname = xstrdup(optarg);
|
||||
break;
|
||||
default:
|
||||
goto usage;
|
||||
}
|
||||
}
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
if (argc != 0)
|
||||
goto usage;
|
||||
|
||||
return (0);
|
||||
|
||||
usage:
|
||||
xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
|
||||
|
||||
self->entry->free(self);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
{
|
||||
struct cmd_attach_session_data *data = self->data;
|
||||
struct session *s;
|
||||
char *cause;
|
||||
struct cmd_target_data *data = self->data;
|
||||
struct session *s;
|
||||
char *cause;
|
||||
|
||||
if (ctx->flags & CMD_KEY)
|
||||
return;
|
||||
|
||||
if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL)
|
||||
|
||||
if ((s = cmd_find_session(ctx, data->target)) == NULL)
|
||||
return;
|
||||
|
||||
if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
|
||||
@@ -122,7 +65,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
return;
|
||||
}
|
||||
|
||||
if (data->flag_detach)
|
||||
if (data->flags & CMD_DFLAG)
|
||||
server_write_session(s, MSG_DETACH, NULL, 0);
|
||||
ctx->cmdclient->session = s;
|
||||
|
||||
@@ -131,52 +74,3 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
server_redraw_client(ctx->cmdclient);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_attach_session_send(struct cmd *self, struct buffer *b)
|
||||
{
|
||||
struct cmd_attach_session_data *data = self->data;
|
||||
|
||||
buffer_write(b, data, sizeof *data);
|
||||
cmd_send_string(b, data->cname);
|
||||
cmd_send_string(b, data->sname);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_attach_session_recv(struct cmd *self, struct buffer *b)
|
||||
{
|
||||
struct cmd_attach_session_data *data;
|
||||
|
||||
self->data = data = xmalloc(sizeof *data);
|
||||
buffer_read(b, data, sizeof *data);
|
||||
data->cname = cmd_recv_string(b);
|
||||
data->sname = cmd_recv_string(b);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_attach_session_free(struct cmd *self)
|
||||
{
|
||||
struct cmd_attach_session_data *data = self->data;
|
||||
|
||||
if (data->cname != NULL)
|
||||
xfree(data->cname);
|
||||
if (data->sname != NULL)
|
||||
xfree(data->sname);
|
||||
xfree(data);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_attach_session_print(struct cmd *self, char *buf, size_t len)
|
||||
{
|
||||
struct cmd_attach_session_data *data = self->data;
|
||||
size_t off = 0;
|
||||
|
||||
off += xsnprintf(buf, len, "%s", self->entry->name);
|
||||
if (data == NULL)
|
||||
return;
|
||||
if (off < len && data->flag_detach)
|
||||
off += xsnprintf(buf + off, len - off, " -d");
|
||||
if (off < len && data->cname != NULL)
|
||||
off += xsnprintf(buf + off, len - off, " -c %s", data->cname);
|
||||
if (off < len && data->sname != NULL)
|
||||
off += xsnprintf(buf + off, len - off, " -s %s", data->sname);
|
||||
}
|
||||
|
Reference in New Issue
Block a user