hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

SVN-Revision: 18743
lede-17.01
Felix Fietkau 2009-12-11 04:41:56 +00:00
parent f26b153836
commit 30992cceeb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/config/lex.zconf.c_shipped
View File

@ -2268,7 +2268,10 @@ void zconf_nextfile(const char *name)
struct buffer *buf; struct buffer *buf;
retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files); 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(), printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" : retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match", retval == GLOB_ABORTED ? "read error" : "no match",

5
scripts/config/zconf.l
View File

@ -302,7 +302,10 @@ void zconf_nextfile(const char *name)
struct buffer *buf; struct buffer *buf;
retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files); 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(), printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" : retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match", retval == GLOB_ABORTED ? "read error" : "no match",