diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-13 12:01:12 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-13 12:01:12 +0000 |
| commit | 2311bbd28a227a8b6e6e52bf30665b37315cad11 (patch) | |
| tree | 01fc816db0980b40d0b75905a097b20719fd4156 /cmd-detach-client.c | |
| parent | d4cb178249c6c73c6197e34e871c2b8e803de175 (diff) | |
| parent | 95950bf668cee5a80cd9bbe28d7134a52a240426 (diff) | |
| download | rtmux-2311bbd28a227a8b6e6e52bf30665b37315cad11.tar.gz rtmux-2311bbd28a227a8b6e6e52bf30665b37315cad11.tar.bz2 rtmux-2311bbd28a227a8b6e6e52bf30665b37315cad11.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-detach-client.c')
| -rw-r--r-- | cmd-detach-client.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/cmd-detach-client.c b/cmd-detach-client.c index 69225bae..a10fd42a 100644 --- a/cmd-detach-client.c +++ b/cmd-detach-client.c @@ -33,8 +33,9 @@ const struct cmd_entry cmd_detach_client_entry = { .name = "detach-client", .alias = "detach", - .args = { "as:t:P", 0, 0 }, - .usage = "[-P] [-a] [-s target-session] " CMD_TARGET_CLIENT_USAGE, + .args = { "aE:s:t:P", 0, 0 }, + .usage = "[-aP] [-E shell-command] " + "[-s target-session] " CMD_TARGET_CLIENT_USAGE, .sflag = CMD_SESSION, .tflag = CMD_CLIENT, @@ -63,6 +64,7 @@ cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item) struct client *c = item->state.c, *cloop; struct session *s; enum msgtype msgtype; + const char *cmd = args_get(args, 'E'); if (self->entry == &cmd_suspend_client_entry) { tty_stop_tty(&c->tty); @@ -79,20 +81,31 @@ cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item) if (args_has(args, 's')) { s = item->state.sflag.s; TAILQ_FOREACH(cloop, &clients, entry) { - if (cloop->session == s) - server_client_detach(cloop, msgtype); + if (cloop->session == s) { + if (cmd != NULL) + server_client_exec(cloop, cmd); + else + server_client_detach(cloop, msgtype); + } } return (CMD_RETURN_STOP); } if (args_has(args, 'a')) { TAILQ_FOREACH(cloop, &clients, entry) { - if (cloop->session != NULL && cloop != c) - server_client_detach(cloop, msgtype); + if (cloop->session != NULL && cloop != c) { + if (cmd != NULL) + server_client_exec(cloop, cmd); + else + server_client_detach(cloop, msgtype); + } } return (CMD_RETURN_NORMAL); } - server_client_detach(c, msgtype); + if (cmd != NULL) + server_client_exec(c, cmd); + else + server_client_detach(c, msgtype); return (CMD_RETURN_STOP); } |