diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-06-05 21:25:00 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-06-05 21:25:00 +0000 |
commit | 0b9b873a5505de6fdfb8f02cfbaef5fc82831a5f (patch) | |
tree | f034330734848ce9df96ee94ab4dc6a7ad025dc9 /cmd-rename-session.c | |
parent | ee1a7fded7653ffc2ba68a4188c89a7cb6e1bf1d (diff) |
Big reorganisation of command-line syntax.
Diffstat (limited to 'cmd-rename-session.c')
-rw-r--r-- | cmd-rename-session.c | 127 |
1 files changed, 13 insertions, 114 deletions
diff --git a/cmd-rename-session.c b/cmd-rename-session.c index 904963b8..ab0f0469 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-rename-session.c,v 1.10 2008-06-05 17:12:10 nicm Exp $ */ +/* $Id: cmd-rename-session.c,v 1.11 2008-06-05 21:25:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -27,134 +27,33 @@ * Change session name. */ -int cmd_rename_session_parse(struct cmd *, int, char **, char **); void cmd_rename_session_exec(struct cmd *, struct cmd_ctx *); -void cmd_rename_session_send(struct cmd *, struct buffer *); -void cmd_rename_session_recv(struct cmd *, struct buffer *); -void cmd_rename_session_free(struct cmd *); -void cmd_rename_session_print(struct cmd *, char *, size_t); - -struct cmd_rename_session_data { - char *cname; - char *sname; - char *newname; -}; const struct cmd_entry cmd_rename_session_entry = { "rename-session", "rename", - "[-c client-tty|-s session-name] new-name", - 0, - cmd_rename_session_parse, + CMD_TARGET_SESSION_USAGE " new-name", + CMD_ONEARG, + cmd_target_init, + cmd_target_parse, cmd_rename_session_exec, - cmd_rename_session_send, - cmd_rename_session_recv, - cmd_rename_session_free, - NULL, - cmd_rename_session_print + cmd_target_send, + cmd_target_recv, + cmd_target_free, + cmd_target_print }; -int -cmd_rename_session_parse(struct cmd *self, int argc, char **argv, char **cause) -{ - struct cmd_rename_session_data *data; - int opt; - - self->data = data = xmalloc(sizeof *data); - data->cname = NULL; - data->sname = NULL; - data->newname = NULL; - - while ((opt = getopt(argc, argv, "c:s:")) != EOF) { - switch (opt) { - case 'c': - if (data->sname != NULL) - goto usage; - if (data->cname == NULL) - data->cname = xstrdup(optarg); - 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 != 1) - goto usage; - - data->newname = xstrdup(argv[0]); - - return (0); - -usage: - xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage); - - self->entry->free(self); - return (-1); -} - void cmd_rename_session_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_rename_session_data *data = self->data; - struct session *s; - - if (data == NULL) - return; + struct cmd_target_data *data = self->data; + struct session *s; - if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL) + if ((s = cmd_find_session(ctx, data->target)) == NULL) return; xfree(s->name); - s->name = xstrdup(data->newname); + s->name = xstrdup(data->arg); if (ctx->cmdclient != NULL) server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); } - -void -cmd_rename_session_send(struct cmd *self, struct buffer *b) -{ - struct cmd_rename_session_data *data = self->data; - - buffer_write(b, data, sizeof *data); - cmd_send_string(b, data->cname); - cmd_send_string(b, data->sname); - cmd_send_string(b, data->newname); -} - -void -cmd_rename_session_recv(struct cmd *self, struct buffer *b) -{ - struct cmd_rename_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); - data->newname = cmd_recv_string(b); -} - -void -cmd_rename_session_free(struct cmd *self) -{ - struct cmd_rename_session_data *data = self->data; - - if (data->cname != NULL) - xfree(data->cname); - if (data->sname != NULL) - xfree(data->sname); - if (data->newname != NULL) - xfree(data->newname); - xfree(data); -} - -void -cmd_rename_session_print(struct cmd *cmd, char *buf, size_t len) -{ -} |