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 /cmd-respawn-window.c | |
| parent | df912e3540968a2a0b266e523ecc08bb2dc0ca20 (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 'cmd-respawn-window.c')
| -rw-r--r-- | cmd-respawn-window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index c15ca376..a178a2ba 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -27,7 +27,7 @@ * Respawn a window (restart the command). Kill existing if -k given. */ -int cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_respawn_window_entry = { "respawn-window", "respawnw", @@ -39,7 +39,7 @@ const struct cmd_entry cmd_respawn_window_entry = { cmd_respawn_window_exec }; -int +enum cmd_retval cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -52,7 +52,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) char *cause; if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL) - return (-1); + return (CMD_RETURN_ERROR); w = wl->window; if (!args_has(self->args, 'k')) { @@ -61,7 +61,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) continue; ctx->error(ctx, "window still active: %s:%d", s->name, wl->idx); - return (-1); + return (CMD_RETURN_ERROR); } } @@ -85,7 +85,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) free(cause); environ_free(&env); server_destroy_pane(wp); - return (-1); + return (CMD_RETURN_ERROR); } layout_init(w); window_pane_reset_mode(wp); @@ -97,5 +97,5 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx) server_redraw_window(w); environ_free(&env); - return (0); + return (CMD_RETURN_NORMAL); } |