diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-10-31 13:55:10 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-10-31 13:55:10 +0000 |
| commit | 3f5ec24b5a70421f74c42344cc13af0562d4af4e (patch) | |
| tree | 4a431f0e4eb76a468e086b81dbc15deca44ac691 | |
| parent | d8d9c2af98487b1d64983e44ca592cd40b945bbe (diff) | |
| download | rtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.tar.gz rtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.tar.bz2 rtmux-3f5ec24b5a70421f74c42344cc13af0562d4af4e.zip | |
Sync OpenBSD patchset 972:
Didn't really think the else behaviour through - requiring argv to
contain "else" is silly so just omit that, also some manpage
tweaks. From Tiago Cunha.
| -rw-r--r-- | cmd-if-shell.c | 26 | ||||
| -rw-r--r-- | tmux.1 | 10 |
2 files changed, 13 insertions, 23 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index a290f09f..220fc33c 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -25,10 +25,9 @@ #include "tmux.h" /* - * Executes a tmux command if a shell command returns true. + * Executes a tmux command if a shell command returns true or false. */ -int cmd_if_shell_check(struct args *); int cmd_if_shell_exec(struct cmd *, struct cmd_ctx *); void cmd_if_shell_callback(struct job *); @@ -36,11 +35,11 @@ void cmd_if_shell_free(void *); const struct cmd_entry cmd_if_shell_entry = { "if-shell", "if", - "", 2, 4, - "shell-command command [else command]", + "", 2, 3, + "shell-command command [command]", 0, NULL, - cmd_if_shell_check, + NULL, cmd_if_shell_exec }; @@ -51,16 +50,6 @@ struct cmd_if_shell_data { }; int -cmd_if_shell_check(struct args *args) -{ - if (args->argc == 3) - return (-1); - if (args->argc == 4 && strcmp(args->argv[2], "else") != 0) - return (-1); - return (0); -} - -int cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -69,8 +58,8 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) cdata = xmalloc(sizeof *cdata); cdata->cmd_if = xstrdup(args->argv[1]); - if (args->argc == 4) - cdata->cmd_else = xstrdup(args->argv[3]); + if (args->argc == 3) + cdata->cmd_else = xstrdup(args->argv[2]); else cdata->cmd_else = NULL; memcpy(&cdata->ctx, ctx, sizeof cdata->ctx); @@ -91,8 +80,7 @@ cmd_if_shell_callback(struct job *job) struct cmd_if_shell_data *cdata = job->data; struct cmd_ctx *ctx = &cdata->ctx; struct cmd_list *cmdlist; - char *cmd; - char *cause; + char *cause, *cmd; if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) { cmd = cdata->cmd_else; @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 23 2011 $ +.Dd $Mdocdate: October 27 2011 $ .Dt TMUX 1 .Os .Sh NAME @@ -2975,13 +2975,15 @@ Miscellaneous commands are as follows: .Bl -tag -width Ds .It Ic clock-mode Op Fl t Ar target-pane Display a large clock. -.It Ic if-shell Ar shell-command command +.It Ic if-shell Ar shell-command command Op Ar command .D1 (alias: Ic if ) -Execute +Execute the first .Ar command if .Ar shell-command -returns success. +returns success or the second +.Ar command +otherwise. .It Ic lock-server .D1 (alias: Ic lock ) Lock each client individually by running the command specified by the |