summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-kill-session.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2013-03-24 09:54:10 +0000
committernicm <nicm@openbsd.org>2013-03-24 09:54:10 +0000
commit175d36cccd2fcc2eae91dce1d3b4e3f4079aa983 (patch)
tree916aed045266a229704154541db1b8ab571a9aa2 /usr.bin/tmux/cmd-kill-session.c
parentExpand format variables in the run-shell and if-shell shell commands, (diff)
downloadwireguard-openbsd-175d36cccd2fcc2eae91dce1d3b4e3f4079aa983.tar.xz
wireguard-openbsd-175d36cccd2fcc2eae91dce1d3b4e3f4079aa983.zip
Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent commands. This allows run-shell and if-shell to be synchronous which has been much requested. Each client has a default command queue and commands are consumed one at a time from it. A command may suspend execution from the queue by returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example run-shell does this from the callback that is fired after the job is freed. When the command queue becomes empty, command clients are automatically exited (unless attaching). A callback is also fired - this is used for nested commands in, for example, if-shell which can block execution of the client's cmdq until a new cmdq becomes empty. Also merge all the old error/info/print functions together and lose the old curclient/cmdclient distinction - a cmdq is bound to one client (or none if in the configuration file), this is a command client if c->session is NULL otherwise an attached client.
Diffstat (limited to 'usr.bin/tmux/cmd-kill-session.c')
-rw-r--r--usr.bin/tmux/cmd-kill-session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-kill-session.c b/usr.bin/tmux/cmd-kill-session.c
index 25788700006..a13bc007761 100644
--- a/usr.bin/tmux/cmd-kill-session.c
+++ b/usr.bin/tmux/cmd-kill-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-kill-session.c,v 1.11 2012/07/11 07:10:15 nicm Exp $ */
+/* $OpenBSD: cmd-kill-session.c,v 1.12 2013/03/24 09:54:10 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -27,7 +27,7 @@
* Note this deliberately has no alias to make it hard to hit by accident.
*/
-enum cmd_retval cmd_kill_session_exec(struct cmd *, struct cmd_ctx *);
+enum cmd_retval cmd_kill_session_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_kill_session_entry = {
"kill-session", NULL,
@@ -40,12 +40,12 @@ const struct cmd_entry cmd_kill_session_entry = {
};
enum cmd_retval
-cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
+cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
struct session *s, *s2, *s3;
- if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
+ if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
return (CMD_RETURN_ERROR);
if (args_has(args, 'a')) {