Allow the config file parser and source-file to return "don't exit" to

the client to let attach work from configuration files.

1 files changed, 19 insertions, 3 deletions

diff --git a/cmd-source-file.c b/cmd-source-file.c
index 93a0800c..5ba7ed8b 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -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