diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | pty.c | 88 | ||||
| -rw-r--r-- | tmux.c | 5 | ||||
| -rw-r--r-- | tmux.h | 4 | ||||
| -rw-r--r-- | window.c | 2 |
5 files changed, 5 insertions, 96 deletions
diff --git a/Makefile.am b/Makefile.am index e0eb143c..7c356c06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,7 @@ dist_tmux_SOURCES = \ options.c \ paste.c \ proc.c \ - pty.c \ + procname.c \ resize.c \ screen-redraw.c \ screen-write.c \ @@ -1,88 +0,0 @@ -/* $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> -#ifdef __OpenBSD__ -#include <sys/tty.h> -#endif - -#include <fcntl.h> -#include <string.h> -#include <termios.h> -#include <unistd.h> - -#include "compat.h" - -int pty_open(int *); -pid_t pty_fork(int, int *, char *, size_t, struct winsize *); - -#ifdef __OpenBSD__ -int -pty_open(int *fd) -{ - *fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC); - if (*fd < 0) - return (-1); - return (0); -} -#else -int -pty_open(__unused int *fd) -{ - *fd = -1; - return (0); -} -#endif - -#ifdef __OpenBSD__ -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); -} -#else -pid_t -pty_fork(__unused int ptmfd, int *fd, char *name, __unused size_t namelen, - struct winsize *ws) -{ - return (forkpty(fd, name, NULL, ws)); -} -#endif @@ -29,6 +29,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"); @@ -2313,8 +2313,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 */ @@ -889,7 +889,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; |