aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-29 04:32:06 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-29 04:32:06 +0000
commitadd09583da3f652a6695dd534ea9ed4aefca97a0 (patch)
tree7dbd8b78aab0091637cca11896226583177bacbe /sysdeps
parentbc3bb89c0a7c124d7320f143e52b353cdde645f5 (diff)
downloadglibc-add09583da3f652a6695dd534ea9ed4aefca97a0.tar
glibc-add09583da3f652a6695dd534ea9ed4aefca97a0.tar.gz
glibc-add09583da3f652a6695dd534ea9ed4aefca97a0.tar.bz2
glibc-add09583da3f652a6695dd534ea9ed4aefca97a0.zip
Update.
* sysdeps/generic/glob.c (glob): Don't pass GLOB_NOMAGIC flag to glob_in_dir [PR libc/3385]. * posix/globtest.sh: Add test case.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/glob.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index af409c54b2..4a56f90f63 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -494,7 +494,7 @@ glob (pattern, flags, errfunc, pglob)
#endif
result = glob (onealt,
- ((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC))
+ ((flags & ~(GLOB_NOCHECK | GLOB_NOMAGIC))
| GLOB_APPEND), errfunc, pglob);
/* If we got an error, return it. */
@@ -929,7 +929,8 @@ glob (pattern, flags, errfunc, pglob)
old_pathc = pglob->gl_pathc;
status = glob_in_dir (filename, dirs.gl_pathv[i],
- ((flags | GLOB_APPEND) & ~GLOB_NOCHECK),
+ ((flags | GLOB_APPEND)
+ & ~(GLOB_NOCHECK | GLOB_NOMAGIC)),
errfunc, pglob);
if (status == GLOB_NOMATCH)
/* No matches in this directory. Try the next. */