diff options
| author |   nicm <nicm@openbsd.org> | 2015-04-24 22:19:36 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-04-24 22:19:36 +0000 |
| commit | 0bc4603ee530d558f38fe8e7cfc8e3c84007cb0f (patch) | |
| tree | e38292f58794c78c138bfe224a87d266b8820516 /usr.bin/tmux/cmd-run-shell.c | |
| parent | struct timespec/clock_gettime(3) conversion for vi(1). (diff) | |
| download | wireguard-openbsd-0bc4603ee530d558f38fe8e7cfc8e3c84007cb0f.tar.xz wireguard-openbsd-0bc4603ee530d558f38fe8e7cfc8e3c84007cb0f.zip | |
Set working directory for run-shell and if-shell.
Diffstat (limited to 'usr.bin/tmux/cmd-run-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-run-shell.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c index 2189686d352..6fac94f519d 100644 --- a/usr.bin/tmux/cmd-run-shell.c +++ b/usr.bin/tmux/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-run-shell.c,v 1.27 2015/02/05 10:29:43 nicm Exp $ */ +/* $OpenBSD: cmd-run-shell.c,v 1.28 2015/04/24 22:19:36 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -80,16 +80,24 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq) struct winlink *wl = NULL; struct window_pane *wp = NULL; struct format_tree *ft; + int cwd; - if (args_has(args, 't')) + if (args_has(args, 't')) { wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp); - else { + cwd = wp->cwd; + } else { c = cmd_find_client(cmdq, NULL, 1); if (c != NULL && c->session != NULL) { s = c->session; wl = s->curw; wp = wl->window->active; } + if (cmdq->client != NULL && cmdq->client->session == NULL) + cwd = cmdq->client->cwd; + else if (s != NULL) + cwd = s->cwd; + else + cwd = -1; } ft = format_create(); @@ -105,7 +113,8 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq) cdata->cmdq = cmdq; cmdq->references++; - job_run(shellcmd, s, cmd_run_shell_callback, cmd_run_shell_free, cdata); + job_run(shellcmd, s, cwd, cmd_run_shell_callback, cmd_run_shell_free, + cdata); if (cdata->bflag) return (CMD_RETURN_NORMAL); |