From 1340c012b05695fea9e2ee9d07b477c7d8150129 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Sat, 12 May 2012 15:00:19 +0000
Subject: [PATCH] Sync OpenBSD patchset 1111:

Add a helper function to open the terminal for attach-/new-session.
---
 cmd-attach-session.c | 13 +++----------
 cmd-new-session.c    | 11 ++---------
 server-client.c      | 19 +++++++++++++++++++
 tmux.h               |  1 +
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 54c4051f..cc2006f1 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -43,7 +43,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session	*s;
 	struct client	*c;
 	const char	*update;
-	char		*overrides, *cause;
+	char		*cause;
 	u_int		 i;
 
 	if (RB_EMPTY(&sessions)) {
@@ -79,15 +79,8 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 		server_redraw_client(ctx->curclient);
 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 	} else {
-		if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
-			ctx->error(ctx, "not a terminal");
-			return (-1);
-		}
-
-		overrides =
-		    options_get_string(&s->options, "terminal-overrides");
-		if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
-			ctx->error(ctx, "terminal open failed: %s", cause);
+		if (server_client_open(ctx->cmdclient, s, &cause) != 0) {
+			ctx->error(ctx, "open terminal failed: %s", cause);
 			xfree(cause);
 			return (-1);
 		}
diff --git a/cmd-new-session.c b/cmd-new-session.c
index e0c3b64d..e7d21d3b 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -63,7 +63,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct termios		 tio, *tiop;
 	struct passwd		*pw;
 	const char		*newname, *target, *update, *cwd, *errstr;
-	char			*overrides, *cmd, *cause;
+	char			*cmd, *cause;
 	int			 detached, idx;
 	u_int			 sx, sy, i;
 
@@ -128,14 +128,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	/* Open the terminal if necessary. */
 	if (!detached && ctx->cmdclient != NULL) {
-		if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
-			ctx->error(ctx, "not a terminal");
-			return (-1);
-		}
-
-		overrides =
-		    options_get_string(&global_s_options, "terminal-overrides");
-		if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
+		if (server_client_open(ctx->cmdclient, NULL, &cause) != 0) {
 			ctx->error(ctx, "open terminal failed: %s", cause);
 			xfree(cause);
 			return (-1);
diff --git a/server-client.c b/server-client.c
index 44a5e13f..6e2484e0 100644
--- a/server-client.c
+++ b/server-client.c
@@ -104,6 +104,25 @@ server_client_create(int fd)
 	log_debug("new client %d", fd);
 }
 
+/* Open client terminal if needed. */
+int
+server_client_open(struct client *c, struct session *s, char **cause)
+{
+	struct options	*oo = s != NULL ? &s->options : &global_s_options;
+	char		*overrides;
+
+	if (!(c->flags & CLIENT_TERMINAL)) {
+		*cause = xstrdup ("not a terminal");
+		return (-1);
+	}
+
+	overrides = options_get_string(oo, "terminal-overrides");
+	if (tty_open(&c->tty, overrides, cause) != 0)
+		return (-1);
+
+	return (0);
+}
+
 /* Lost a client. */
 void
 server_client_lost(struct client *c)
diff --git a/tmux.h b/tmux.h
index e86da24f..9f99c66a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1719,6 +1719,7 @@ void	 server_add_accept(int);
 
 /* server-client.c */
 void	 server_client_create(int);
+int      server_client_open(struct client *, struct session *, char **);
 void	 server_client_lost(struct client *);
 void	 server_client_callback(int, short, void *);
 void	 server_client_status_timer(void);