diff options
author | okan | 2011-08-22 16:18:05 +0000 |
---|---|---|
committer | okan | 2011-08-22 16:18:05 +0000 |
commit | b2429e1779cb86c9e6108bf0ffdf561b07a96327 (patch) | |
tree | 0c97f3670424ae61a7573e8c665a25d20fdf6085 /parse.y | |
parent | 6326403c3f2dcb66746a00c6c20cd7e7ca11f8f2 (diff) | |
download | cwm-b2429e1779cb86c9e6108bf0ffdf561b07a96327.tar.gz |
revert r1.11 of parse.y and create logic in conf_setup instead to deal
with the various scenarios of when to attempt a parse of the config,
load defaults, and when to warn and/or exit. triggered by bogus warning
first noticed by sobrado@.
ok oga@
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.29 2011/07/25 15:10:24 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.30 2011/08/22 16:18:05 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -462,8 +462,6 @@ pushfile(const char *name) nfile->name = xstrdup(name); if ((nfile->stream = fopen(nfile->name, "r")) == NULL) { - if (errno != ENOENT) - warn("%s", nfile->name); free(nfile->name); free(nfile); return (NULL); |