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

Initialise socket_path before parsing configuration file.

Browse Source
This commit is contained in:
Nicholas Marriott
2009-03-04 17:33:30 +00:00
parent 65b9aeb337
commit a9a22d7ede
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server.c
View File

@@ -1,4 +1,4 @@
/* $Id: server.c,v 1.124 2009-02-21 17:52:25 nicm Exp $ */
/* $Id: server.c,v 1.125 2009-03-04 17:33:30 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -163,6 +163,9 @@ server_start(const char *path)
server_password = NULL;
server_activity = time(NULL);
start_time = time(NULL);
socket_path = path;
if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0) {
log_warnx("%s", cause);
exit(1);
@@ -173,8 +176,6 @@ server_start(const char *path)
setproctitle("server (%s)", path);
#endif
log_debug("server started, pid %ld", (long) getpid());
start_time = time(NULL);
socket_path = path;
memset(&sa, 0, sizeof sa);
sa.sun_family = AF_UNIX;