diff options
| author |   nicm <nicm@openbsd.org> | 2010-12-29 21:28:32 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-12-29 21:28:32 +0000 |
| commit | b719fcb083acabe2bd57c4a90291bffb9d1471d0 (patch) | |
| tree | 5e762d3735c67fa96eaf06d5406620d32a24d21e /usr.bin/tmux/cmd-source-file.c | |
| parent | knf (diff) | |
| download | wireguard-openbsd-b719fcb083acabe2bd57c4a90291bffb9d1471d0.tar.xz wireguard-openbsd-b719fcb083acabe2bd57c4a90291bffb9d1471d0.zip | |
Allow the config file parser and source-file to return "don't exit" to
the client to let attach work from configuration files.
Diffstat (limited to 'usr.bin/tmux/cmd-source-file.c')
| -rw-r--r-- | usr.bin/tmux/cmd-source-file.c | 24 |
1 files changed, 20 insertions, 4 deletions
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 |