summaryrefslogtreecommitdiffstats
path: root/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2010-02-06 17:15:33 +0000
committerNicholas Marriott <nicm@openbsd.org>2010-02-06 17:15:33 +0000
commit8aba77b7be489a93dc843d7ef4378bd73b5385b1 (patch)
tree060d27ad5846fc444116eb205f9b2b72c186717f /tmux.c
parent5e6a7c85ccdbabda01e7c05a10f7bd8dcee47e70 (diff)
Instead of bailing out on the first configuration file error, carry on,
collecting all the errors, then start with the active window in more mode displaying them.
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/tmux.c b/tmux.c
index 758ad842..b59dd176 100644
--- a/tmux.c
+++ b/tmux.c
@@ -432,15 +432,10 @@ main(int argc, char **argv)
home = pw->pw_dir;
}
xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
- if (access(cfg_file, R_OK) != 0) {
+ if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
xfree(cfg_file);
cfg_file = NULL;
}
- } else {
- if (access(cfg_file, R_OK) != 0) {
- log_warn("%s", cfg_file);
- exit(1);
- }
}
/*