aboutsummaryrefslogtreecommitdiff
path: root/control.c
diff options
context:
space:
mode:
Diffstat (limited to 'control.c')
-rw-r--r--control.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/control.c b/control.c
index b5ec6bdb..f00f57f9 100644
--- a/control.c
+++ b/control.c
@@ -93,7 +93,7 @@ void
control_callback(struct client *c, int closed, unused void *data)
{
char *line, *cause;
- struct cmd_ctx ctx;
+ struct cmd_ctx *ctx;
struct cmd_list *cmdlist;
if (closed)
@@ -108,22 +108,24 @@ control_callback(struct client *c, int closed, unused void *data)
break;
}
- ctx.msgdata = NULL;
- ctx.cmdclient = NULL;
- ctx.curclient = c;
+ ctx = cmd_get_ctx();
+ ctx->msgdata = NULL;
+ ctx->cmdclient = NULL;
+ ctx->curclient = c;
- ctx.error = control_msg_error;
- ctx.print = control_msg_print;
- ctx.info = control_msg_info;
+ ctx->error = control_msg_error;
+ ctx->print = control_msg_print;
+ ctx->info = control_msg_info;
if (cmd_string_parse(line, &cmdlist, &cause) != 0) {
control_write(c, "%%error in line \"%s\": %s", line,
cause);
free(cause);
} else {
- cmd_list_exec(cmdlist, &ctx);
+ cmd_list_exec(cmdlist, ctx);
cmd_list_free(cmdlist);
}
+ cmd_free_ctx(ctx);
free(line);
}