diff options
author | Tiago Cunha <tcunha@gmx.com> | 2010-02-08 18:10:07 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2010-02-08 18:10:07 +0000 |
commit | a32d095c97177eaa7ba7d2a3c723df1b878e9922 (patch) | |
tree | e67b2e8974142e2eec1d28bf8d146cdba647cadd /tmux.c | |
parent | 676d0809d2ecd38df0a135d505106f53cbed17fc (diff) |
Sync OpenBSD patchset 635:
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.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.199 2010-02-05 01:32:10 tcunha Exp $ */ +/* $Id: tmux.c,v 1.200 2010-02-08 18:10:07 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -435,15 +435,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); - } } /* |