mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-04 18:21:07 +00:00
menuconfig: allow wildcard includes to return no match (#6339)
SVN-Revision: 18743
This commit is contained in:
parent
f26b153836
commit
30992cceeb
@ -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",
|
||||||
|
@ -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",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user