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

Bad merge.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-01-25 16:38:13 +00:00
parent 21d8f77a0d
commit 0f9354eec2
7 changed files with 158 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server.c
View File

@@ -26,6 +26,7 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
#include <paths.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -147,7 +148,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
if (log_get_level() > 3)
tty_create_log();
if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
"tty ps", NULL) != 0)
fatal("pledge failed");
@@ -157,7 +157,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
TAILQ_INIT(&clients);
RB_INIT(&sessions);
TAILQ_INIT(&session_groups);
mode_key_init_trees();
key_bindings_init();
gettimeofday(&start_time, NULL);