menuconfig: allow wildcard includes to return no match (#6339)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18743 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped
index 42bcdd4..3163737 100644 (file)
--- 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 7acb60f..71107a5 100644 (file)
--- 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",