Rather than constructing an entire termios struct from ttydefaults.h, just let

forkpty do it and then alter the bits that should be changed after fork. A
little neater and more portable.

6 files changed, 35 insertions, 27 deletions

diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index 77322fabd68..adba608fcf8 100644
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.18 2009/09/15 07:45:16 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.19 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -21,9 +21,6 @@
 #include <string.h>
 #include <termios.h>
 
-#define TTYDEFCHARS
-#include <sys/ttydefaults.h>
-
 #include "tmux.h"
 
 /*
@@ -116,7 +113,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session			*s;
 	struct window			*w;
 	struct environ			 env;
-	struct termios			 tio;
+	struct termios			 tio, *tiop;
 	const char			*update;
 	char				*overrides, *cmd, *cwd, *cause;
 	int				 detached, idx;
@@ -151,8 +148,8 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 		detached = 1;
 
 	/*
-	 * Fill in the termios settings used for new windows in this session;
-	 * if there is a command client, use the control characters from it.
+	 * Save the termios settings, part of which is used for new windows in
+	 * this session.
 	 *
 	 * This is read again with tcgetattr() rather than using tty.tio as if
 	 * detached, tty_open won't be called. Because of this, it must be done
@@ -162,15 +159,9 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if (ctx->cmdclient != NULL && ctx->cmdclient->tty.fd != -1) {
 		if (tcgetattr(ctx->cmdclient->tty.fd, &tio) != 0)
 			fatal("tcgetattr failed");
+		tiop = &tio;
 	} else
-		memcpy(tio.c_cc, ttydefchars, sizeof tio.c_cc);
-	tio.c_cc[VERASE] = '\177';
-	tio.c_iflag = TTYDEF_IFLAG;
-	tio.c_oflag = TTYDEF_OFLAG;
-	tio.c_lflag = TTYDEF_LFLAG;
-	tio.c_cflag = TTYDEF_CFLAG;
-	cfsetispeed(&tio, TTYDEF_SPEED);
-	cfsetospeed(&tio, TTYDEF_SPEED);
+		tiop = NULL;
 
 	/* Open the terminal if necessary. */
 	if (!detached && ctx->cmdclient != NULL) {
@@ -227,7 +218,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	/* Create the new session. */
 	idx = -1 - options_get_number(&global_s_options, "base-index");
 	s = session_create(
-	    data->newname, cmd, cwd, &env, &tio, idx, sx, sy, &cause);
+	    data->newname, cmd, cwd, &env, tiop, idx, sx, sy, &cause);
 	if (s == NULL) {
 		ctx->error(ctx, "create session failed: %s", cause);
 		xfree(cause);
diff --git a/usr.bin/tmux/cmd-respawn-window.c b/usr.bin/tmux/cmd-respawn-window.c
index a201eb7a350..57e7716ba84 100644
--- a/usr.bin/tmux/cmd-respawn-window.c
+++ b/usr.bin/tmux/cmd-respawn-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-respawn-window.c,v 1.8 2009/09/01 13:09:49 nicm Exp $ */
+/* $OpenBSD: cmd-respawn-window.c,v 1.9 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -76,7 +76,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	window_pane_resize(wp, w->sx, w->sy);
 	if (window_pane_spawn(
-	    wp, data->arg, NULL, NULL, &env, &s->tio, &cause) != 0) {
+	    wp, data->arg, NULL, NULL, &env, s->tio, &cause) != 0) {
 		ctx->error(ctx, "respawn window failed: %s", cause);
 		xfree(cause);
 		environ_free(&env);
diff --git a/usr.bin/tmux/cmd-split-window.c b/usr.bin/tmux/cmd-split-window.c
index 19fe3af2ebb..b2ab049f4f0 100644
--- a/usr.bin/tmux/cmd-split-window.c
+++ b/usr.bin/tmux/cmd-split-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.11 2009/09/01 13:09:49 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.12 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -190,7 +190,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		shell = _PATH_BSHELL;
 
 	wp = window_add_pane(w, hlimit);
-	if (window_pane_spawn(wp, cmd, shell, cwd, &env, &s->tio, &cause) != 0)
+	if (window_pane_spawn(wp, cmd, shell, cwd, &env, s->tio, &cause) != 0)
 		goto error;
 	if (layout_split_pane(w->active, type, size, wp) != 0) {
 		cause = xstrdup("pane too small");
diff --git a/usr.bin/tmux/session.c b/usr.bin/tmux/session.c
index 6fae595e32e..e4ba1a38167 100644
--- a/usr.bin/tmux/session.c
+++ b/usr.bin/tmux/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.7 2009/09/07 21:01:50 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.8 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -139,7 +139,12 @@ session_create(const char *name, const char *cmd, const char *cwd,
 	environ_init(&s->environ);
 	if (env != NULL)
 		environ_copy(env, &s->environ);
-	memcpy(&s->tio, tio, sizeof s->tio);
+
+	s->tio = NULL;
+	if (tio != NULL) {
+		s->tio = xmalloc(sizeof *s->tio);
+		memcpy(s->tio, tio, sizeof *s->tio);
+	}
 
 	s->sx = sx;
 	s->sy = sy;
@@ -182,6 +187,9 @@ session_destroy(struct session *s)
 	while (!ARRAY_EMPTY(&sessions) && ARRAY_LAST(&sessions) == NULL)
 		ARRAY_TRUNC(&sessions, 1);
 
+	if (s->tio != NULL)
+		xfree(s->tio);
+
 	session_alert_cancel(s, NULL);
 	environ_free(&s->environ);
 	options_free(&s->options);
@@ -237,7 +245,7 @@ session_new(struct session *s,
 
 	hlimit = options_get_number(&s->options, "history-limit");
 	w = window_create(
-	    name, cmd, shell, cwd, &env, &s->tio, s->sx, s->sy, hlimit, cause);
+	    name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, hlimit, cause);
 	if (w == NULL) {
 		environ_free(&env);
 		return (NULL);
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 65b33bafdde..752b43f8727 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.104 2009/09/14 11:25:35 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.105 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -815,7 +815,7 @@ struct session {
 #define SESSION_DEAD 0x2
 	int		 flags;
 
-	struct termios   tio;
+	struct termios	*tio;
 
 	struct environ	 environ;
 
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index 71dd36521f1..ecc4646d321 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.24 2009/09/01 14:40:33 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.25 2009/09/16 12:35:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -454,6 +454,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 	struct environ_entry	*envent;
 	const char		*ptr;
 	struct timeval	 	 tv;
+	struct termios		 tio2;
 	u_int		 	 i;
 
 	if (wp->fd != -1)
@@ -484,7 +485,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 	tv.tv_usec = NAME_INTERVAL * 1000L;
 	timeradd(&wp->window->name_timer, &tv, &wp->window->name_timer);
 
- 	switch (wp->pid = forkpty(&wp->fd, wp->tty, tio, &ws)) {
+ 	switch (wp->pid = forkpty(&wp->fd, wp->tty, NULL, &ws)) {
 	case -1:
 		wp->fd = -1;
 		xasprintf(cause, "%s: %s", cmd, strerror(errno));
@@ -493,6 +494,14 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 		if (chdir(wp->cwd) != 0)
 			chdir("/");
 
+		if (tcgetattr(STDIN_FILENO, &tio2) != 0)
+			fatal("tcgetattr failed");
+		if (tio != NULL)
+			memcpy(tio2.c_cc, tio->c_cc, sizeof tio2.c_cc);
+		tio2.c_cc[VERASE] = '\177';
+		if (tcsetattr(STDIN_FILENO, TCSANOW, &tio2) != 0)
+			fatal("tcgetattr failed");
+
 		ARRAY_INIT(&varlist);
 		for (varp = environ; *varp != NULL; varp++) {
 			var = xstrdup(*varp);