diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/pty.c | 67 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.c | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/window.c | 4 |
5 files changed, 8 insertions, 79 deletions
diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile index 411959dfad4..81d5fbcb097 100644 --- a/usr.bin/tmux/Makefile +++ b/usr.bin/tmux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2017/02/16 12:18:38 nicm Exp $ +# $OpenBSD: Makefile,v 1.87 2017/04/20 17:49:26 nicm Exp $ PROG= tmux SRCS= alerts.c \ @@ -95,7 +95,6 @@ SRCS= alerts.c \ paste.c \ proc.c \ procname.c \ - pty.c \ resize.c \ screen-redraw.c \ screen-write.c \ diff --git a/usr.bin/tmux/pty.c b/usr.bin/tmux/pty.c deleted file mode 100644 index 61778866b11..00000000000 --- a/usr.bin/tmux/pty.c +++ /dev/null @@ -1,67 +0,0 @@ -/* $OpenBSD: pty.c,v 1.2 2017/01/24 19:53:37 nicm Exp $ */ - -/* - * 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/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index e19d871f02e..34edbca400c 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.180 2017/04/19 12:44:29 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.181 2017/04/20 17:49:26 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -32,6 +32,7 @@ #include <string.h> #include <time.h> #include <unistd.h> +#include <util.h> #include "tmux.h" @@ -260,8 +261,8 @@ main(int argc, char **argv) if (shellcmd != NULL && argc != 0) usage(); - if (pty_open(&ptm_fd) != 0) - errx(1, "open(\"/dev/ptm\""); + if ((ptm_fd = getptmfd()) == -1) + err(1, "getptmfd"); if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd " "recvfd proc exec tty ps", NULL) != 0) err(1, "pledge"); diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 939e5ad3203..3c46b8ded0b 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.743 2017/04/20 09:43:45 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.744 2017/04/20 17:49:26 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2307,8 +2307,4 @@ 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/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index 5ec2613f67e..314e3365b26 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.189 2017/04/20 09:43:45 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.190 2017/04/20 17:49:26 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -883,7 +883,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); - wp->pid = pty_fork(ptm_fd, &wp->fd, wp->tty, sizeof wp->tty, &ws); + wp->pid = fdforkpty(ptm_fd, &wp->fd, wp->tty, NULL, &ws); switch (wp->pid) { case -1: wp->fd = -1; |