Move -s and -c down a level so handling them is the responsibility of the command (with some helper functions), rather than the top-level. This changes the action command syntax so that -s and -c must be after the command rather than before.

1 files changed, 24 insertions, 10 deletions

diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 1741b36e..e9c336df 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-attach-session.c,v 1.11 2007-12-06 09:46:21 nicm Exp $ */
+/* $Id: cmd-attach-session.c,v 1.12 2008-06-02 18:08:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -26,19 +26,21 @@
  * Attach existing session to the current terminal.
  */
 
-int	cmd_attach_session_parse(void **, int, char **, char **);
+int	cmd_attach_session_parse(struct cmd *, void **, int, char **, char **);
 void	cmd_attach_session_exec(void *, struct cmd_ctx *);
 void	cmd_attach_session_send(void *, struct buffer *);
 void	cmd_attach_session_recv(void **, struct buffer *);
 void	cmd_attach_session_free(void *);
 
 struct cmd_attach_session_data {
+	char	*sname;
 	int	 flag_detach;
 };
 
 const struct cmd_entry cmd_attach_session_entry = {
-	"attach-session", "attach", "[-d]",
-	CMD_CANTNEST|CMD_NOCLIENT,
+	"attach-session", "attach",
+	"[-d] [-s session-name]",
+	CMD_CANTNEST,
 	cmd_attach_session_parse,
 	cmd_attach_session_exec,
 	cmd_attach_session_send,
@@ -47,19 +49,24 @@ const struct cmd_entry cmd_attach_session_entry = {
 };
 
 int
-cmd_attach_session_parse(void **ptr, int argc, char **argv, char **cause)
+cmd_attach_session_parse(
+    struct cmd *self, void **ptr, int argc, char **argv, char **cause)
 {
 	struct cmd_attach_session_data	*data;
 	int				 opt;
 
 	*ptr = data = xmalloc(sizeof *data);
+	data->sname = NULL;
 	data->flag_detach = 0;
 
-	while ((opt = getopt(argc, argv, "dn:")) != EOF) {
+	while ((opt = getopt(argc, argv, "ds:")) != EOF) {
 		switch (opt) {
 		case 'd':
 			data->flag_detach = 1;
 			break;
+		case 's':
+			data->sname = xstrdup(optarg);
+			break;
 		default:
 			goto usage;
 		}
@@ -72,8 +79,7 @@ cmd_attach_session_parse(void **ptr, int argc, char **argv, char **cause)
 	return (0);
 
 usage:
-	usage(cause, "%s %s",
-	    cmd_attach_session_entry.name, cmd_attach_session_entry.usage);
+	usage(cause, "%s %s", self->entry->name, self->entry->usage);
 
 	cmd_attach_session_free(data);
 	return (-1);
@@ -83,11 +89,15 @@ void
 cmd_attach_session_exec(void *ptr, struct cmd_ctx *ctx)
 {
 	struct cmd_attach_session_data	*data = ptr;
+	struct session			*s;
 	char				*cause;
 
 	if (ctx->flags & CMD_KEY)
 		return;
 
+	if ((s = cmd_find_session(ctx, data->sname)) == NULL)
+		return;
+
 	if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
 		ctx->error(ctx, "not a terminal");
 		return;
@@ -100,8 +110,8 @@ cmd_attach_session_exec(void *ptr, struct cmd_ctx *ctx)
 	}
 
 	if (data->flag_detach)
-		server_write_session(ctx->session, MSG_DETACH, NULL, 0);
-	ctx->cmdclient->session = ctx->session;
+		server_write_session(s, MSG_DETACH, NULL, 0);
+	ctx->cmdclient->session = s;
 
 	server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
 	recalculate_sizes();
@@ -114,6 +124,7 @@ cmd_attach_session_send(void *ptr, struct buffer *b)
 	struct cmd_attach_session_data	*data = ptr;
 
 	buffer_write(b, data, sizeof *data);
+	cmd_send_string(b, data->sname);
 }
 
 void
@@ -123,6 +134,7 @@ cmd_attach_session_recv(void **ptr, struct buffer *b)
 
 	*ptr = data = xmalloc(sizeof *data);
 	buffer_read(b, data, sizeof *data);
+	data->sname = cmd_recv_string(b);
 }
 
 void
@@ -130,5 +142,7 @@ cmd_attach_session_free(void *ptr)
 {
 	struct cmd_attach_session_data	*data = ptr;
 
+	if (data->sname != NULL)
+		xfree(data->sname);
 	xfree(data);
 }