diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-12-11 04:41:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-12-11 04:41:56 +0000 |
| commit | 30992cceeb2403d9fa362f50068189cca22c9aeb (patch) | |
| tree | 700f0d64d7027b174fb00e85939cdde085d984dd /scripts/config | |
| parent | f26b1538365c24c8e905e6385ec8ac89e6fd3d01 (diff) | |
| download | master-31e0f0ae-30992cceeb2403d9fa362f50068189cca22c9aeb.tar.gz master-31e0f0ae-30992cceeb2403d9fa362f50068189cca22c9aeb.tar.bz2 master-31e0f0ae-30992cceeb2403d9fa362f50068189cca22c9aeb.zip | |
menuconfig: allow wildcard includes to return no match (#6339)
SVN-Revision: 18743
Diffstat (limited to 'scripts/config')
| -rw-r--r-- | scripts/config/lex.zconf.c_shipped | 5 | ||||
| -rw-r--r-- | scripts/config/zconf.l | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped index 42bcdd4562..31637377ab 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 7acb60f8e7..71107a56e7 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", |