qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

slightly alter the semantics of config files:

Browse Source 
- if no config file, continue silently and apply defaults
 - if config file, parse and move on
 - if config file specified but not found, error out

ok oga@
This commit is contained in:
okan 2008-06-14 21:51:00 +00:00
parent 4a6468a264
commit b48fb0f64d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $Id: conf.c,v 1.37 2008/06/14 21:48:54 okan Exp $ * $Id: conf.c,v 1.38 2008/06/14 21:51:00 okan Exp $
*/ */
#include "headers.h" #include "headers.h"
@ -168,6 +168,8 @@ conf_init(struct conf *c)
void void
conf_setup(struct conf *c, const char *conf_file) conf_setup(struct conf *c, const char *conf_file)
{ {
struct stat sb;
if (conf_file == NULL) { if (conf_file == NULL) {
char *home = getenv("HOME"); char *home = getenv("HOME");
@ -177,7 +179,11 @@ conf_setup(struct conf *c, const char *conf_file)
snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", home, snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", home,
CONFFILE); CONFFILE);
} else } else
snprintf(c->conf_path, sizeof(c->conf_path), "%s", conf_file); if (stat(conf_file, &sb) == -1 || !(sb.st_mode & S_IFREG))
errx(1, "%s: %s", conf_file, strerror(errno));
else
snprintf(c->conf_path, sizeof(c->conf_path), "%s",
conf_file);
conf_init(c); conf_init(c);

5
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.10 2008/06/14 21:48:54 okan Exp $ */ /* $OpenBSD: parse.y,v 1.11 2008/06/14 21:51:00 okan Exp $ */
/* /*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -441,7 +441,8 @@ pushfile(const char *name)
nfile->name = xstrdup(name); nfile->name = xstrdup(name);
if ((nfile->stream = fopen(nfile->name, "r")) == NULL) { if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
warn("%s", nfile->name); if (errno != ENOENT)
warn("%s", nfile->name);
free(nfile->name); free(nfile->name);
free(nfile); free(nfile);
return (NULL); return (NULL);