From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 11 Dec 2009 04:41:56 +0000 (+0000)
Subject: menuconfig: allow wildcard includes to return no match (#6339)
X-Git-Tag: reboot~21686
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=30992cceeb2403d9fa362f50068189cca22c9aeb;p=openwrt%2Fstaging%2Fblogic.git

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

SVN-Revision: 18743
---

diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped
index 42bcdd45620a..31637377aba1 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 7acb60f8e70d..71107a56e75c 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",