diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
| commit | ede8312d59c5d08990f83f38682c26434823525b (patch) | |
| tree | bdf66e80ca1d71548a554804f4ab6656a828a821 /server-client.c | |
| parent | df912e3540968a2a0b266e523ecc08bb2dc0ca20 (diff) | |
| download | rtmux-ede8312d59c5d08990f83f38682c26434823525b.tar.gz rtmux-ede8312d59c5d08990f83f38682c26434823525b.tar.bz2 rtmux-ede8312d59c5d08990f83f38682c26434823525b.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 'server-client.c')
| -rw-r--r-- | server-client.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 20f539ae..8ad996b0 100644 --- a/server-client.c +++ b/server-client.c @@ -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; |