mirror of
https://github.com/tmux/tmux.git
synced 2024-12-13 18:38:48 +00:00
Sync OpenBSD patchset 476:
Reorder slightly to tidy code.
This commit is contained in:
parent
053e40572c
commit
ee1cc9f415
13
server.c
13
server.c
@ -1,4 +1,4 @@
|
|||||||
/* $Id: server.c,v 1.214 2009-10-28 23:14:15 tcunha Exp $ */
|
/* $Id: server.c,v 1.215 2009-11-02 21:39:34 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -275,14 +275,13 @@ server_start(char *path)
|
|||||||
srv_fd = server_create_socket();
|
srv_fd = server_create_socket();
|
||||||
server_client_create(pair[1]);
|
server_client_create(pair[1]);
|
||||||
|
|
||||||
if (access(SYSTEM_CFG, R_OK) != 0) {
|
if (access(SYSTEM_CFG, R_OK) == 0) {
|
||||||
if (errno != ENOENT) {
|
if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
|
||||||
xasprintf(
|
|
||||||
&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
|
|
||||||
goto error;
|
goto error;
|
||||||
}
|
} else if (errno != ENOENT) {
|
||||||
} else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
|
xasprintf(&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
|
||||||
goto error;
|
goto error;
|
||||||
|
}
|
||||||
if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
|
if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user