diff options
| author |   nicm <nicm@openbsd.org> | 2009-11-01 23:20:37 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-11-01 23:20:37 +0000 |
| commit | 8fa62d4f0962cba060ad8da1fc86b25b571c71d1 (patch) | |
| tree | ddca20aaf5d9089774de26d27f5392c06d1cedf9 /usr.bin/tmux/cmd-if-shell.c | |
| parent | If the last name field looks like a description rather than an alias (if it (diff) | |
| download | wireguard-openbsd-8fa62d4f0962cba060ad8da1fc86b25b571c71d1.tar.xz wireguard-openbsd-8fa62d4f0962cba060ad8da1fc86b25b571c71d1.zip | |
Add a flag for jobs that shouldn't be freed after they've died and use it for
status jobs, then only kill those jobs when status-left, status-right or
set-titles-string is changed.
Fixes problems with changing options from inside #().
Diffstat (limited to 'usr.bin/tmux/cmd-if-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-if-shell.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c index 67d573b02ab..190bc65e8cb 100644 --- a/usr.bin/tmux/cmd-if-shell.c +++ b/usr.bin/tmux/cmd-if-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-if-shell.c,v 1.5 2009/10/11 09:10:57 nicm Exp $ */ +/* $OpenBSD: cmd-if-shell.c,v 1.6 2009/11/01 23:20:37 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -65,7 +65,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->curclient != NULL) ctx->curclient->references++; - job = job_add(NULL, NULL, + job = job_add(NULL, 0, NULL, data->arg, cmd_if_shell_callback, cmd_if_shell_free, cdata); job_run(job); @@ -80,10 +80,8 @@ cmd_if_shell_callback(struct job *job) struct cmd_list *cmdlist; char *cause; - if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) { - job_free(job); /* calls cmd_if_shell_free */ + if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) return; - } if (cmd_string_parse(cdata->cmd, &cmdlist, &cause) != 0) { if (cause != NULL) { |