Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30405
Modified Files:
cfg.c cmd-source-file.c
Log Message:
Sync OpenBSD patchset 811:
Allow the config file parser and source-file to return "don't exit" to
the client to let attach work from configuration files.
Index: cmd-source-file.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd-source-file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cmd-source-file.c 8 Feb 2010 18:29:32 -0000 1.13
+++ cmd-source-file.c 30 Dec 2010 22:26:07 -0000 1.14
@@ -91,19 +91,35 @@
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
Index: cfg.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cfg.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cfg.c 6 Jun 2010 00:04:18 -0000 1.27
+++ cfg.c 30 Dec 2010 22:26:07 -0000 1.28
@@ -80,6 +80,7 @@
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 @@
n = 0;
line = NULL;
+ retval = 0;
while ((buf = fgetln(f, &len))) {
if (buf[len - 1] == '\n')
buf[len - 1] = '\0';
@@ -125,19 +127,17 @@
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);
}
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
