qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:03:08 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18743 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-12-11 04:41:56 +00:00
parent d521cd8038
commit fc838a6bb8
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",