diff options
| author | Thomas Adam <thomas@xteddy.org> | 2023-08-23 20:37:42 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2023-08-23 20:37:42 +0100 |
| commit | 70ecf17f857837d399a2cb641fa9628a12615cb3 (patch) | |
| tree | 64bcbb5aebd4fce05e4488e0aebc9bcdcb4b4243 /cmd-run-shell.c | |
| parent | 071849f82f64d686a0d5eb93e0abb751056476ae (diff) | |
| parent | 71d453f169ffac345db3e4c82f4409fc41091002 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-run-shell.c')
| -rw-r--r-- | cmd-run-shell.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c index 560eface..ddb5b1b4 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -44,8 +44,9 @@ const struct cmd_entry cmd_run_shell_entry = { .name = "run-shell", .alias = "run", - .args = { "bd:Ct:", 0, 1, cmd_run_shell_args_parse }, - .usage = "[-bC] [-d delay] " CMD_TARGET_PANE_USAGE " [shell-command]", + .args = { "bd:Ct:c:", 0, 2, cmd_run_shell_args_parse }, + .usage = "[-bC] [-c start-directory] [-d delay] " CMD_TARGET_PANE_USAGE + " [shell-command]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, @@ -103,6 +104,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item) struct args *args = cmd_get_args(self); struct cmd_find_state *target = cmdq_get_target(item); struct cmd_run_shell_data *cdata; + struct client *c = cmdq_get_client(item); struct client *tc = cmdq_get_target_client(item); struct session *s = target->s; struct window_pane *wp = target->wp; @@ -137,7 +139,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item) cdata->wp_id = -1; if (wait) { - cdata->client = cmdq_get_client(item); + cdata->client = c; cdata->item = item; } else { cdata->client = tc; @@ -145,8 +147,10 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item) } if (cdata->client != NULL) cdata->client->references++; - - cdata->cwd = xstrdup(server_client_get_cwd(cmdq_get_client(item), s)); + if (args_has(args, 'c')) + cdata->cwd = xstrdup(args_get(args, 'c')); + else + cdata->cwd = xstrdup(server_client_get_cwd(c, s)); cdata->s = s; if (s != NULL) |