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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	tmux.1
	window.c
This commit is contained in:
Thomas Adam
2017-06-05 11:59:38 +01:00
parent 1c83c0ebcd 2f04108f3a
commit e62e17d046
13 changed files with 144 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server.c
View File

@ -150,7 +150,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
}
close(pair[0]);
if (log_get_level() > 3)
if (log_get_level() > 1)
tty_create_log();
if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
"tty ps", NULL) != 0)
@ -364,6 +364,9 @@ server_signal(int sig)
}
server_add_accept(0);
break;
case SIGUSR2:
proc_toggle_log(server_proc);
break;
}
}