diff options
| author |   nicm <nicm@openbsd.org> | 2013-03-24 09:33:35 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-03-24 09:33:35 +0000 |
| commit | 0a0dfdd810a59ee29083196f932ae72f6cc5201d (patch) | |
| tree | 7b9e4341ccdb5faee038acaa6dc62499834a75d7 /usr.bin/tmux/cmd-if-shell.c | |
| parent | Merge send-prefix into send-keys. (diff) | |
| download | wireguard-openbsd-0a0dfdd810a59ee29083196f932ae72f6cc5201d.tar.xz wireguard-openbsd-0a0dfdd810a59ee29083196f932ae72f6cc5201d.zip | |
Expand format variables in the run-shell and if-shell shell commands,
from Thiago Padilha.
Diffstat (limited to 'usr.bin/tmux/cmd-if-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-if-shell.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c index ecec3a10d52..bd2b2a9eff1 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.18 2013/03/22 15:49:55 nicm Exp $ */ +/* $OpenBSD: cmd-if-shell.c,v 1.19 2013/03/24 09:33:35 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -36,8 +36,8 @@ void cmd_if_shell_free(void *); const struct cmd_entry cmd_if_shell_entry = { "if-shell", "if", - "", 2, 3, - "shell-command command [command]", + "t:", 2, 3, + CMD_TARGET_PANE_USAGE " shell-command command [command]", 0, NULL, NULL, @@ -55,7 +55,22 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; struct cmd_if_shell_data *cdata; - const char *shellcmd = args->argv[0]; + char *shellcmd; + struct session *s; + struct winlink *wl; + struct window_pane *wp; + struct format_tree *ft; + + wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp); + if (wl == NULL) + return (CMD_RETURN_ERROR); + + ft = format_create(); + format_session(ft, s); + format_winlink(ft, s, wl); + format_window_pane(ft, wp); + shellcmd = format_expand(ft, args->argv[0]); + format_free(ft); cdata = xmalloc(sizeof *cdata); cdata->cmd_if = xstrdup(args->argv[1]); @@ -68,6 +83,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) cmd_ref_ctx(ctx); job_run(shellcmd, cmd_if_shell_callback, cmd_if_shell_free, cdata); + free(shellcmd); return (CMD_RETURN_YIELD); /* don't let client exit */ } |