diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-05-13 08:32:46 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-05-13 08:32:46 +0100 |
| commit | 2377092a70db3327cbeb07328ea8422d0395edc4 (patch) | |
| tree | c5ede8c90856cf9ded1a0d62e62fe1089d580ef3 /cmd-source-file.c | |
| parent | af25cab11b4dc17d3c1a7c2c2cf6e40b8f2b3ae9 (diff) | |
| parent | 6cb74f4b7dad1e21f2fb0714c7fe83a85bf92a2c (diff) | |
| download | rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.tar.gz rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.tar.bz2 rtmux-2377092a70db3327cbeb07328ea8422d0395edc4.zip | |
Merge branch 'master' of github.com:tmux/tmux
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); } |