From 21895563586a7f5a6cf11c3b97d2c4a61555c122 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 6 Feb 2010 17:15:34 +0000 Subject: 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. --- usr.bin/tmux/tmux.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'usr.bin/tmux/tmux.c') 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 @@ -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); - } } /* -- cgit v1.2.3