circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Reorder slightly to tidy code.

Browse Source
This commit is contained in:
Nicholas Marriott
2009-11-02 12:48:44 +00:00
parent 2f813ef75d
commit 992dd86309
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server.c
View File

@@ -272,14 +272,13 @@ server_start(char *path)
srv_fd = server_create_socket();
server_client_create(pair[1]);
if (access(SYSTEM_CFG, R_OK) != 0) {
if (errno != ENOENT) {
xasprintf(
&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
if (access(SYSTEM_CFG, R_OK) == 0) {
if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
goto error;
}
} else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
} else if (errno != ENOENT) {
xasprintf(&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
goto error;
}
if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
goto error;