summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2007-07-12 17:54:59 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2007-07-12 17:54:59 +0000
commite9146d35223ce1fe1296af61599745f58adaf21f (patch)
tree161fd70f913a5d22d48180e13dc194ae0120c233 /usr.bin
parent656801657ad20e8be113f39cb558c0af7d5abc33 (diff)
Do not fatal() if the CVSROOT/config file does not exist.
Matches GNU's behaviour. OK ray@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/config.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/cvs/config.c b/usr.bin/cvs/config.c
index d1e0557f122..6dc7091603a 100644
--- a/usr.bin/cvs/config.c
+++ b/usr.bin/cvs/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.9 2007/02/22 06:42:09 otto Exp $ */
+/* $OpenBSD: config.c,v 1.10 2007/07/12 17:54:58 xsa Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -40,9 +40,11 @@ cvs_parse_configfile(void)
cvs_log(LP_TRACE, "cvs_parse_configfile(%s)", fpath);
- if ((fp = fopen(fpath, "r")) == NULL)
- fatal("cvs_config_parse: %s: %s",
- CVS_PATH_CONFIG, strerror(errno));
+ if ((fp = fopen(fpath, "r")) == NULL) {
+ if (errno != ENOENT)
+ cvs_log(LP_ERRNO, "%s", CVS_PATH_CONFIG);
+ return;
+ }
lbuf = NULL;
while ((buf = fgetln(fp, &len))) {