summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-11 04:41:56 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-11 04:41:56 +0000
commitfc838a6bb82b9c3979cbc56d7da8300322c2a8cb (patch)
tree239e33eaea8fb2159c4213e4fc55c972e55df6aa /scripts
parentd521cd80384dccc7974c50887ef71d859213d43b (diff)
menuconfig: allow wildcard includes to return no match (#6339)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18743 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/lex.zconf.c_shipped5
-rw-r--r--scripts/config/zconf.l5
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped
index 42bcdd456..31637377a 100644
--- a/scripts/config/lex.zconf.c_shipped
+++ b/scripts/config/lex.zconf.c_shipped
@@ -2268,7 +2268,10 @@ void zconf_nextfile(const char *name)
struct buffer *buf;
retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files);
- if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED || retval == GLOB_NOMATCH) {
+ if (retval == GLOB_NOMATCH)
+ return;
+
+ if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED) {
printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match",
diff --git a/scripts/config/zconf.l b/scripts/config/zconf.l
index 7acb60f8e..71107a56e 100644
--- a/scripts/config/zconf.l
+++ b/scripts/config/zconf.l
@@ -302,7 +302,10 @@ void zconf_nextfile(const char *name)
struct buffer *buf;
retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files);
- if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED || retval == GLOB_NOMATCH) {
+ if (retval == GLOB_NOMATCH)
+ return;
+
+ if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED) {
printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match",