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

Do not print any parse errors when ~/.cwmrc is missing. Regression introduced in

Browse Source 
revision 1.109 of calmwm.c.

ok okan@
This commit is contained in:
anton 2018-02-19 19:29:42 +00:00
parent f703f1b398
commit 0fee670a91
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.70 2018/02/02 13:27:25 okan Exp $ */ /* $OpenBSD: parse.y,v 1.71 2018/02/19 19:29:42 anton Exp $ */
/* /*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -43,7 +43,7 @@ static struct file {
int lineno; int lineno;
int errors; int errors;
} *file, *topfile; } *file, *topfile;
struct file *pushfile(const char *); struct file *pushfile(const char *, FILE *);
int popfile(void); int popfile(void);
int yyparse(void); int yyparse(void);
int yylex(void); int yylex(void);
@ -557,19 +557,13 @@ nodigits:
} }
struct file * struct file *
pushfile(const char *name) pushfile(const char *name, FILE *stream)
{ {
struct file *nfile; struct file *nfile;
nfile = xcalloc(1, sizeof(struct file)); nfile = xcalloc(1, sizeof(struct file));
nfile->name = xstrdup(name); nfile->name = xstrdup(name);
nfile->stream = stream;
if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
warn("%s", nfile->name);
free(nfile->name);
free(nfile);
return (NULL);
}
nfile->lineno = 1; nfile->lineno = 1;
TAILQ_INSERT_TAIL(&files, nfile, entry); TAILQ_INSERT_TAIL(&files, nfile, entry);
return (nfile); return (nfile);
@ -594,13 +588,19 @@ popfile(void)
int int
parse_config(const char *filename, struct conf *xconf) parse_config(const char *filename, struct conf *xconf)
{ {
FILE *stream;
int errors = 0; int errors = 0;
conf = xconf; conf = xconf;
if ((file = pushfile(filename)) == NULL) { stream = fopen(filename, "r");
if (stream == NULL) {
if (errno == ENOENT)
return (0);
warn("%s", filename);
return (-1); return (-1);
} }
file = pushfile(filename, stream);
topfile = file; topfile = file;
yyparse(); yyparse();