diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-19 18:23:40 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-19 18:23:40 +0000 |
| commit | 93230a64bc9369c726cc68d3f539b3bf66cff069 (patch) | |
| tree | 0ad90cda9a0db39a058cbac8ceec67e6e7215354 /cmd-new-window.c | |
| parent | 5f6a351df72f76f98ee1ed3494d025fe591fdb69 (diff) | |
| download | rtmux-93230a64bc9369c726cc68d3f539b3bf66cff069.tar.gz rtmux-93230a64bc9369c726cc68d3f539b3bf66cff069.tar.bz2 rtmux-93230a64bc9369c726cc68d3f539b3bf66cff069.zip | |
Pass return code from _exec; allow command sequences to work from the command line.
Diffstat (limited to 'cmd-new-window.c')
| -rw-r--r-- | cmd-new-window.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cmd-new-window.c b/cmd-new-window.c index 25a1fb21..f9dec3ee 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-new-window.c,v 1.28 2009-01-18 14:40:48 nicm Exp $ */ +/* $Id: cmd-new-window.c,v 1.29 2009-01-19 18:23:40 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -27,7 +27,7 @@ */ int cmd_new_window_parse(struct cmd *, int, char **, char **); -void cmd_new_window_exec(struct cmd *, struct cmd_ctx *); +int cmd_new_window_exec(struct cmd *, struct cmd_ctx *); void cmd_new_window_send(struct cmd *, struct buffer *); void cmd_new_window_recv(struct cmd *, struct buffer *); void cmd_new_window_free(struct cmd *); @@ -109,7 +109,7 @@ usage: return (-1); } -void +int cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_new_window_data *data = self->data; @@ -119,11 +119,11 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) int idx; if (data == NULL) - return; + return (0); if (arg_parse_window(data->target, &s, &idx) != 0) { ctx->error(ctx, "bad window: %s", data->target); - return; + return (-1); } if (s == NULL) s = ctx->cursession; @@ -131,7 +131,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) s = cmd_current_session(ctx); if (s == NULL) { ctx->error(ctx, "session not found: %s", data->target); - return; + return (-1); } cmd = data->cmd; @@ -145,7 +145,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) wl = session_new(s, data->name, cmd, cwd, idx); if (wl == NULL) { ctx->error(ctx, "command failed: %s", cmd); - return; + return (-1); } if (!data->flag_detached) { session_select(s, wl->idx); @@ -153,8 +153,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) } else server_status_session(s); - if (ctx->cmdclient != NULL) - server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); + return (0); } void |