diff options
| author |   nicm <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
| commit | a224d0d3ac3348ad8dc1a5ad50b3236b714355cb (patch) | |
| tree | df2f2d708c70b79c7062f0952940023e476a9709 /usr.bin/tmux/server-client.c | |
| parent | Separate total block counter (reported to user) from 8-bit block counter (diff) | |
| download | wireguard-openbsd-a224d0d3ac3348ad8dc1a5ad50b3236b714355cb.tar.xz wireguard-openbsd-a224d0d3ac3348ad8dc1a5ad50b3236b714355cb.zip | |
Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index db8e357fcac..ca937bd8549 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.77 2012/07/10 11:53:01 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.78 2012/07/11 07:10:15 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -868,8 +868,16 @@ server_client_msg_command(struct client *c, struct msg_command_data *data) } cmd_free_argv(argc, argv); - if (cmd_list_exec(cmdlist, &ctx) != 1) + switch (cmd_list_exec(cmdlist, &ctx)) + { + case CMD_RETURN_ERROR: + case CMD_RETURN_NORMAL: c->flags |= CLIENT_EXIT; + break; + case CMD_RETURN_ATTACH: + case CMD_RETURN_YIELD: + break; + } cmd_list_free(cmdlist); return; |