circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Add functions to allocate and free command contexts rather than doing it

Browse Source 
all on the stack.
This commit is contained in:
Nicholas Marriott
2013-03-22 15:49:55 +00:00
parent 29613f2f31
commit d1e6ce2672
4 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd-if-shell.c
View File

@@ -47,7 +47,7 @@ const struct cmd_entry cmd_if_shell_entry = {
struct cmd_if_shell_data {
char *cmd_if;
char *cmd_else;
struct cmd_ctx ctx;
struct cmd_ctx *ctx;
};
enum cmd_retval
@@ -63,12 +63,9 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
cdata->cmd_else = xstrdup(args->argv[2]);
else
cdata->cmd_else = NULL;
memcpy(&cdata->ctx, ctx, sizeof cdata->ctx);
if (ctx->cmdclient != NULL)
ctx->cmdclient->references++;
if (ctx->curclient != NULL)
ctx->curclient->references++;
cdata->ctx = ctx;
cmd_ref_ctx(ctx);
job_run(shellcmd, cmd_if_shell_callback, cmd_if_shell_free, cdata);
@@ -79,7 +76,7 @@ void
cmd_if_shell_callback(struct job *job)
{
struct cmd_if_shell_data *cdata = job->data;
struct cmd_ctx *ctx = &cdata->ctx;
struct cmd_ctx *ctx = cdata->ctx;
struct cmd_list *cmdlist;
char *cause, *cmd;
@@ -105,14 +102,11 @@ void
cmd_if_shell_free(void *data)
{
struct cmd_if_shell_data *cdata = data;
struct cmd_ctx *ctx = &cdata->ctx;
struct cmd_ctx *ctx = cdata->ctx;
if (ctx->cmdclient != NULL) {
ctx->cmdclient->references--;
if (ctx->cmdclient != NULL)
ctx->cmdclient->flags |= CLIENT_EXIT;
}
if (ctx->curclient != NULL)
ctx->curclient->references--;
cmd_free_ctx(ctx);
free(cdata->cmd_else);
free(cdata->cmd_if);