KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

SVN-Revision: 39862
This commit is contained in:
Felix Fietkau 2014-03-10 18:58:40 +00:00
parent 5ef90f6540
commit 81013f6bbe
2 changed files with 14 additions and 0 deletions
Show stats 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; int i;
err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl); 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) { if (err) {
const char *reason = "unknown error"; 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; int i;
err = glob(name, GLOB_ERR | GLOB_MARK, NULL, &gl); 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) { if (err) {
const char *reason = "unknown error"; const char *reason = "unknown error";