diff options
| author |   nicm <nicm@openbsd.org> | 2013-04-24 10:01:32 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-04-24 10:01:32 +0000 |
| commit | ebf82b564eed43957ceec1a8ebfe047244498e71 (patch) | |
| tree | 33f8e1216f46ab4e36e7568ad1eacc202ea63e13 /usr.bin/tmux/server.c | |
| parent | When a ucom(4) is removed, it frees the tty with ttyfree(). However if (diff) | |
| download | wireguard-openbsd-ebf82b564eed43957ceec1a8ebfe047244498e71.tar.xz wireguard-openbsd-ebf82b564eed43957ceec1a8ebfe047244498e71.zip | |
Rename global configuration define.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index c9a0604cd30..96ac0cb671d 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.109 2013/03/24 09:54:10 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.110 2013/04/24 10:01:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -169,13 +169,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) { |