crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts/config: make wildcard include with no results non-fatal

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39862 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2014-03-10 18:58:40 +00:00
parent 37b41d7e50
commit 2729ebed04
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/config/zconf.l
View file

@ -345,6 +345,13 @@ void zconf_nextfile(const char *name)
int i;
err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
/* ignore wildcard patterns that return no result */
if (err == GLOB_NOMATCH && strchr(name, '*')) {
err = 0;
gl.gl_pathc = 0;
}
if (err) {
const char *reason = "unknown error";

7
scripts/config/zconf.lex.c_shipped
View file

@ -2401,6 +2401,13 @@ void zconf_nextfile(const char *name)
int i;
err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl);
/* ignore wildcard patterns that return no result */
if (err == GLOB_NOMATCH && strchr(name, '*')) {
err = 0;
gl.gl_pathc = 0;
}
if (err) {
const char *reason = "unknown error";