diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-10 18:58:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-10 18:58:40 +0000 |
| commit | 81013f6bbecf5177ae472d01365c066504ccbdb8 (patch) | |
| tree | a005fc185f7c3e9d7b43272528ea0952da1c6a88 /scripts | |
| parent | 5ef90f65403de9e9f532e0f2ffb26b0937460c78 (diff) | |
| download | upstream-81013f6bbecf5177ae472d01365c066504ccbdb8.tar.gz upstream-81013f6bbecf5177ae472d01365c066504ccbdb8.tar.bz2 upstream-81013f6bbecf5177ae472d01365c066504ccbdb8.zip | |
scripts/config: make wildcard include with no results non-fatal
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39862
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config/zconf.l | 7 | ||||
| -rw-r--r-- | scripts/config/zconf.lex.c_shipped | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/scripts/config/zconf.l b/scripts/config/zconf.l index bce3da6653..3aef45983a 100644 --- a/scripts/config/zconf.l +++ b/scripts/config/zconf.l @@ -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"; diff --git a/scripts/config/zconf.lex.c_shipped b/scripts/config/zconf.lex.c_shipped index aae284229c..766549fbfe 100644 --- a/scripts/config/zconf.lex.c_shipped +++ b/scripts/config/zconf.lex.c_shipped @@ -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"; |