diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-24 10:57:03 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-24 10:57:03 +0100 |
commit | 4f3c31a6b63f4489bfc672b510036fd8d9491595 (patch) | |
tree | 9f402212e792abe3fc58f4505ed909236a6e9a17 /server.c | |
parent | 11b90bc9591b4b101efef1f8a9a0d9656d2953c9 (diff) |
Use sysconfdir for the location of global tmux.conf (but default it to /etc),
based on changes from Dagobert Michelsen.
Diffstat (limited to 'server.c')
-rw-r--r-- | server.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -170,13 +170,13 @@ server_start(int lockfd, char *lockfile) cfg_references = 1; ARRAY_INIT(&cfg_causes); - if (access(SYSTEM_CFG, R_OK) == 0) { - if (load_cfg(SYSTEM_CFG, cfg_cmd_q, &cause) == -1) { - xasprintf(&cause, "%s: %s", SYSTEM_CFG, cause); + if (access(TMUX_CONF, R_OK) == 0) { + if (load_cfg(TMUX_CONF, cfg_cmd_q, &cause) == -1) { + xasprintf(&cause, "%s: %s", TMUX_CONF, cause); ARRAY_ADD(&cfg_causes, cause); } } else if (errno != ENOENT) { - xasprintf(&cause, "%s: %s", SYSTEM_CFG, strerror(errno)); + xasprintf(&cause, "%s: %s", TMUX_CONF, strerror(errno)); ARRAY_ADD(&cfg_causes, cause); } if (cfg_file != NULL) { |