diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-02-06 17:15:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-02-06 17:15:34 +0000 |
| commit | 21895563586a7f5a6cf11c3b97d2c4a61555c122 (patch) | |
| tree | 749368795e8169c60e61f07c1e40ef49a910516c /usr.bin/tmux/tmux.c | |
| parent | 5ec9c21d7c0e029bdc9820214216686bdd082040 (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 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 1aeeb408e2a..2e56eab2d7f 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.68 2010/02/04 18:27:06 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.69 2010/02/06 17:15:33 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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); - } } /* |