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-source-file.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-source-file.c')
| -rw-r--r-- | cmd-source-file.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cmd-source-file.c b/cmd-source-file.c index 501eb060..f7118179 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -1,4 +1,4 @@ -/* $Id: cmd-source-file.c,v 1.4 2009-01-18 14:40:48 nicm Exp $ */ +/* $Id: cmd-source-file.c,v 1.5 2009-01-19 18:23:40 nicm Exp $ */ /* * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org> @@ -25,7 +25,7 @@ */ int cmd_source_file_parse(struct cmd *, int, char **, char **); -void cmd_source_file_exec(struct cmd *, struct cmd_ctx *); +int cmd_source_file_exec(struct cmd *, struct cmd_ctx *); void cmd_source_file_send(struct cmd *, struct buffer *); void cmd_source_file_recv(struct cmd *, struct buffer *); void cmd_source_file_free(struct cmd *); @@ -88,7 +88,7 @@ usage: return (-1); } -void +int cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_source_file_data *data = self->data; @@ -97,11 +97,10 @@ cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx) if (load_cfg(data->path, &cause) != 0) { ctx->error(ctx, "%s", cause); xfree(cause); - return; + return (-1); } - if (ctx->cmdclient != NULL) - server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); + return (0); } void |