aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-12-11 04:41:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-12-11 04:41:56 +0000
commitefa764f2f06c4b91bfec65825d56923a0dda213e (patch)
tree239e33eaea8fb2159c4213e4fc55c972e55df6aa /scripts
parent0d653a7f9497bdeb142050ee1fefca497e8ae9dc (diff)
downloadupstream-efa764f2f06c4b91bfec65825d56923a0dda213e.tar.gz
upstream-efa764f2f06c4b91bfec65825d56923a0dda213e.tar.bz2
upstream-efa764f2f06c4b91bfec65825d56923a0dda213e.zip
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 42bcdd4562..31637377ab 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 7acb60f8e7..71107a56e7 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",