Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.c

6 files changed, 79 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 0d95873c..cc165bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,6 +165,7 @@ dist_tmux_SOURCES = \
 	options.c \
 	paste.c \
 	proc.c \
+	pty.c \
 	resize.c \
 	screen-redraw.c \
 	screen-write.c \
diff --git a/client.c b/client.c
index e3d65964..ea84d645 100644
--- a/client.c
+++ b/client.c
@@ -304,6 +304,8 @@ client_main(struct event_base *base, int argc, char **argv, int flags,
 #endif
 
 	/* Free stuff that is not used in the client. */
+	if (ptm_fd != -1)
+		close(ptm_fd);
 	options_free(global_options);
 	options_free(global_s_options);
 	options_free(global_w_options);
diff --git a/pty.c b/pty.c
new file mode 100644
index 00000000..05a02ef0
--- /dev/null
+++ b/pty.c
@@ -0,0 +1,67 @@
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/tty.h>
+
+#include <fcntl.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
+#include <util.h>
+
+int	pty_open(int *);
+pid_t	pty_fork(int, int *, char *, size_t, struct winsize *);
+
+int
+pty_open(int *fd)
+{
+	*fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC);
+	if (*fd < 0)
+	    return (-1);
+	return (0);
+}
+
+pid_t
+pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws)
+{
+	struct ptmget	ptm;
+	pid_t		pid;
+
+	if ((ioctl(ptmfd, PTMGET, &ptm) == -1))
+		return (-1);
+
+	strlcpy(name, ptm.sn, namelen);
+	ioctl(ptm.sfd, TIOCSWINSZ, ws);
+
+	switch (pid = fork()) {
+	case -1:
+		close(ptm.cfd);
+		close(ptm.sfd);
+		return (-1);
+	case 0:
+		close(ptm.cfd);
+		login_tty(ptm.sfd);
+		return (0);
+	}
+	*fd = ptm.cfd;
+	close(ptm.sfd);
+	return (pid);
+}
diff --git a/tmux.c b/tmux.c
index 7a513f01..7f55f395 100644
--- a/tmux.c
+++ b/tmux.c
@@ -42,6 +42,7 @@ struct hooks	*global_hooks;
 
 struct timeval	 start_time;
 const char	*socket_path;
+int		 ptm_fd = -1;
 
 static __dead void	 usage(void);
 static char		*make_label(const char *);
@@ -261,6 +262,8 @@ main(int argc, char **argv)
 		usage();
 
 #ifdef __OpenBSD__
+	if (pty_open(&ptm_fd) != 0)
+		errx(1, "open(\"/dev/ptm\"");
 	if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd "
 	    "recvfd proc exec tty ps", NULL) != 0)
 		err(1, "pledge");
diff --git a/tmux.h b/tmux.h
index c0daf5f6..3494119a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1503,6 +1503,7 @@ extern struct options	*global_w_options;
 extern struct environ	*global_environ;
 extern struct timeval	 start_time;
 extern const char	*socket_path;
+extern int		 ptm_fd;
 int		 areshell(const char *);
 void		 setblocking(int, int);
 const char	*find_home(void);
@@ -2333,4 +2334,8 @@ void		 style_apply_update(struct grid_cell *, struct options *,
 int		 style_equal(const struct grid_cell *,
 		     const struct grid_cell *);
 
+/* pty.c */
+int		 pty_open(int *);
+pid_t		 pty_fork(int, int *, char *, size_t, struct winsize *);
+
 #endif /* TMUX_H */
diff --git a/window.c b/window.c
index f5915e5d..70d332fc 100644
--- a/window.c
+++ b/window.c
@@ -892,7 +892,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
 	ws.ws_col = screen_size_x(&wp->base);
 	ws.ws_row = screen_size_y(&wp->base);
 
-	switch (wp->pid = forkpty(&wp->fd, wp->tty, NULL, &ws)) {
+	switch (wp->pid = pty_fork(ptm_fd, &wp->fd, wp->tty, sizeof wp->tty, &ws)) {
 	case -1:
 		wp->fd = -1;
 		xasprintf(cause, "%s: %s", cmd, strerror(errno));