diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-05-12 18:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-05-12 18:01:10 +0100 |
| commit | 6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c (patch) | |
| tree | df22b83d46308de5bf6815fff8f01778e5c83ab0 /cmd-source-file.c | |
| parent | 3ec7e3c006d3eb86547b5a1b47dd8d873d7b0284 (diff) | |
| parent | fdd368a2945f1f5cbd1cd2a858c00ebffdbf7e46 (diff) | |
| download | rtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.tar.gz rtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.tar.bz2 rtmux-6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-source-file.c')
| -rw-r--r-- | cmd-source-file.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cmd-source-file.c b/cmd-source-file.c index d5f5209a..ecebbaca 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -34,8 +34,8 @@ const struct cmd_entry cmd_source_file_entry = { .name = "source-file", .alias = "source", - .args = { "", 1, 1 }, - .usage = "path", + .args = { "q", 1, 1 }, + .usage = "[-q] path", .flags = 0, .exec = cmd_source_file_exec @@ -46,28 +46,26 @@ cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct cmd_q *cmdq1; - char *cause; + int quiet; cmdq1 = cmdq_new(cmdq->client); cmdq1->flags |= cmdq->flags & CMD_Q_NOHOOKS; cmdq1->emptyfn = cmd_source_file_done; cmdq1->data = cmdq; - switch (load_cfg(args->argv[0], cmdq1, &cause)) { + quiet = args_has(args, 'q'); + switch (load_cfg(args->argv[0], cmdq1, quiet)) { case -1: + cmdq_free(cmdq1); if (cfg_references == 0) { - cmdq_free(cmdq1); - cmdq_error(cmdq, "%s", cause); - free(cause); + cfg_print_causes(cmdq); return (CMD_RETURN_ERROR); } - cfg_add_cause("%s", cause); - free(cause); - /* FALLTHROUGH */ + return (CMD_RETURN_NORMAL); case 0: + cmdq_free(cmdq1); if (cfg_references == 0) cfg_print_causes(cmdq); - cmdq_free(cmdq1); return (CMD_RETURN_NORMAL); } |