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

SVN-Revision: 18743
15 years ago · 30992cceeb
parent f26b153836
commit 30992cceeb
2 changed files with 8 additions and 2 deletions
--- 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",
--- 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",