diff options
| -rw-r--r-- | usr.bin/tmux/cfg.c | 12 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-source-file.c | 24 |
2 files changed, 26 insertions, 10 deletions
diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c index 10a7c9fccb9..3957f869550 100644 --- a/usr.bin/tmux/cfg.c +++ b/usr.bin/tmux/cfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfg.c,v 1.11 2010/05/25 19:47:30 nicm Exp $ */ +/* $OpenBSD: cfg.c,v 1.12 2010/12/29 21:28:32 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -80,6 +80,7 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes) size_t len; struct cmd_list *cmdlist; struct cmd_ctx ctx; + int retval; if ((f = fopen(path, "rb")) == NULL) { cfg_add_cause(causes, "%s: %s", path, strerror(errno)); @@ -88,6 +89,7 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes) n = 0; line = NULL; + retval = 0; while ((buf = fgetln(f, &len))) { if (buf[len - 1] == '\n') buf[len - 1] = '\0'; @@ -125,19 +127,17 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes) ctx.info = cfg_print; cfg_cause = NULL; - cmd_list_exec(cmdlist, &ctx); + if (cmd_list_exec(cmdlist, &ctx) == 1) + retval = 1; cmd_list_free(cmdlist); if (cfg_cause != NULL) { cfg_add_cause(causes, "%s: %d: %s", path, n, cfg_cause); xfree(cfg_cause); - continue; } } if (line != NULL) xfree(line); fclose(f); - if (ARRAY_LENGTH(causes) != 0) - return (-1); - return (0); + return (retval); } diff --git a/usr.bin/tmux/cmd-source-file.c b/usr.bin/tmux/cmd-source-file.c index 3e06962ad21..28f960d0b23 100644 --- a/usr.bin/tmux/cmd-source-file.c +++ b/usr.bin/tmux/cmd-source-file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-source-file.c,v 1.9 2010/02/06 23:22:27 nicm Exp $ */ +/* $OpenBSD: cmd-source-file.c,v 1.10 2010/12/29 21:28:32 nicm Exp $ */ /* * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org> @@ -91,19 +91,35 @@ cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx) struct cmd_source_file_data *data = self->data; struct causelist causes; char *cause; + struct window_pane *wp; + int retval; u_int i; ARRAY_INIT(&causes); - if (load_cfg(data->path, ctx, &causes) != 0) { + + retval = load_cfg(data->path, ctx, &causes); + if (ARRAY_EMPTY(&causes)) + return (retval); + + if (retval == 1 && !RB_EMPTY(&sessions) && ctx->cmdclient != NULL) { + wp = RB_MIN(sessions, &sessions)->curw->window->active; + window_pane_set_mode(wp, &window_copy_mode); + window_copy_init_for_output(wp); + for (i = 0; i < ARRAY_LENGTH(&causes); i++) { + cause = ARRAY_ITEM(&causes, i); + window_copy_add(wp, "%s", cause); + xfree(cause); + } + } else { for (i = 0; i < ARRAY_LENGTH(&causes); i++) { cause = ARRAY_ITEM(&causes, i); ctx->print(ctx, "%s", cause); xfree(cause); } - ARRAY_FREE(&causes); } + ARRAY_FREE(&causes); - return (0); + return (retval); } void |