mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use forkpty() except on OpenBSD.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-01-23 12:26:06 +00:00
parent b3a724f30c
commit 1ebe79dd62
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pty.c
View File

@@ -19,13 +19,14 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef __OpenBSD__
#include <sys/tty.h> #include <sys/tty.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <util.h>
int pty_open(int *); int pty_open(int *);
pid_t pty_fork(int, int *, char *, size_t, struct winsize *); pid_t pty_fork(int, int *, char *, size_t, struct winsize *);
@@ -33,15 +34,20 @@ pid_t pty_fork(int, int *, char *, size_t, struct winsize *);
int int
pty_open(int *fd) pty_open(int *fd)
{ {
#ifdef __OpenBSD__
*fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC); *fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC);
if (*fd < 0) if (*fd < 0)
return (-1); return (-1);
#else
*fd = -1;
#endif
return (0); return (0);
} }
pid_t pid_t
pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws) pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws)
{ {
#ifdef __OpenBSD__
struct ptmget ptm; struct ptmget ptm;
pid_t pid; pid_t pid;
@@ -64,4 +70,7 @@ pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws)
*fd = ptm.cfd; *fd = ptm.cfd;
close(ptm.sfd); close(ptm.sfd);
return (pid); return (pid);
#else
return (forkpty(fd, name, NULL, ws));
#endif
} }