From add09583da3f652a6695dd534ea9ed4aefca97a0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 29 Apr 2002 04:32:06 +0000 Subject: 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. --- sysdeps/generic/glob.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sysdeps') 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. */ -- cgit v1.2.3