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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	log.c
	proc.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-25 16:37:30 +00:00
parent 0a2ef2b932 ac8678aefe
commit 890d8da2e3
15 changed files with 222 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server.c
View File

@@ -172,7 +172,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
}
close(pair[0]);
if (debug_level > 3)
if (log_get_level() > 3)
tty_create_log();
#ifdef __OpenBSD__
@@ -189,7 +189,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
mode_key_init_trees();
key_bindings_init();
start_time = time(NULL);
gettimeofday(&start_time, NULL);
server_fd = server_create_socket();
if (server_fd == -1)
@@ -197,9 +197,11 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
server_update_socket();
server_client_create(pair[1]);
unlink(lockfile);
free(lockfile);
close(lockfd);
if (lockfd >= 0) {
unlink(lockfile);
free(lockfile);
close(lockfd);
}
start_cfg();