diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-03-26 17:50:24 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 21:42:54 +0000 |
| commit | a38ba2beea4bb2eea36e687d2527ddb78717ea42 (patch) | |
| tree | c6e866e5d9684e7111c77fd8fa39710333a40294 | |
| parent | e09252abe2baa4f033807c0c77ce273a804f041a (diff) | |
| download | klibc-a38ba2beea4bb2eea36e687d2527ddb78717ea42.tar.gz | |
[klibc] dash: expand: Fix glibc glob(3) support
[ dash commit 6900ff60ef7347a8c1445853a8f4689808e0976e ]
It's been a while since we disabled glob(3) support by default.
It appears to be working now, however, we have to change our
code to detect the no-match case correctly.
In particular, we need to test for GLOB_NOMAGIC | GLOB_NOCHECK
instead of GLOB_MAGCHAR.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/expand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/dash/expand.c b/usr/dash/expand.c index f52f34c9fa0ee..3abfa0c44a228 100644 --- a/usr/dash/expand.c +++ b/usr/dash/expand.c @@ -1205,7 +1205,8 @@ expandmeta(str, flag) ckfree(p); switch (i) { case 0: - if (!(pglob.gl_flags & GLOB_MAGCHAR)) + if ((pglob.gl_flags & (GLOB_NOMAGIC | GLOB_NOCHECK)) == + (GLOB_NOMAGIC | GLOB_NOCHECK)) goto nometa2; addglob(&pglob); globfree(&pglob); |