From 8a37a1cc2d67c3ef9c3c42ddaa3b5dd1d57788ff Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 30 Jan 2010 19:08:47 +0000 Subject: [PATCH] Don't stop parsing command sequences when a command requests the client to stick around (attach-session/new-session). --- cmd-list.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/cmd-list.c b/cmd-list.c index 16fe5921..9adf7f76 100644 --- a/cmd-list.c +++ b/cmd-list.c @@ -77,13 +77,32 @@ int cmd_list_exec(struct cmd_list *cmdlist, struct cmd_ctx *ctx) { struct cmd *cmd; - int n; + int n, retval; + retval = 0; TAILQ_FOREACH(cmd, cmdlist, qentry) { - if ((n = cmd_exec(cmd, ctx)) != 0) - return (n); + if ((n = cmd_exec(cmd, ctx)) == -1) + return (-1); + + /* + * A 1 return value means the command client is being attached + * (sent MSG_READY). + */ + if (n == 1) { + retval = 1; + + /* + * The command client has been attached, so mangle the + * context to treat any following commands as if they + * were called from inside. + */ + if (ctx->curclient == NULL) { + ctx->curclient = ctx->cmdclient; + ctx->cmdclient = NULL; + } + } } - return (0); + return (retval); } void