diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-07-11 07:10:16 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-07-11 07:10:16 +0000 |
| commit | 156a018a1068e24b3e4fe3c282d9f7c23218f83d (patch) | |
| tree | d810dc12ac531587df2b51a4c4a39e577eb803d0 /usr.bin/tmux/cmd-run-shell.c | |
| parent | 5fbceaea80d4bc47fc3ffb9f184c6b478e3b16d1 (diff) | |
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/cmd-run-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-run-shell.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c index 8ca4d08ae2a..a60aa991b0f 100644 --- a/usr.bin/tmux/cmd-run-shell.c +++ b/usr.bin/tmux/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-run-shell.c,v 1.12 2012/07/10 11:53:01 nicm Exp $ */ +/* $OpenBSD: cmd-run-shell.c,v 1.13 2012/07/11 07:10:15 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -29,10 +29,9 @@ * Runs a command without a window. */ -int cmd_run_shell_exec(struct cmd *, struct cmd_ctx *); - -void cmd_run_shell_callback(struct job *); -void cmd_run_shell_free(void *); +enum cmd_retval cmd_run_shell_exec(struct cmd *, struct cmd_ctx *); +void cmd_run_shell_callback(struct job *); +void cmd_run_shell_free(void *); const struct cmd_entry cmd_run_shell_entry = { "run-shell", "run", @@ -49,7 +48,7 @@ struct cmd_run_shell_data { struct cmd_ctx ctx; }; -int +enum cmd_retval cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -67,7 +66,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx) job_run(shellcmd, cmd_run_shell_callback, cmd_run_shell_free, cdata); - return (1); /* don't let client exit */ + return (CMD_RETURN_YIELD); /* don't let client exit */ } void |