circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tmux.c
This commit is contained in:
Thomas Adam
2017-01-23 12:20:43 +00:00
parent d2eab39ffa 98e7fbb2ac
commit b3a724f30c
6 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tmux.c
View File

@ -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");