lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Update.

Browse Source 
* sysdeps/generic/glob.c (glob): Don't pass GLOB_NOMAGIC flag to
	glob_in_dir [PR libc/3385].
	* posix/globtest.sh: Add test case.
This commit is contained in:
Ulrich Drepper
2002-04-29 04:32:06 +00:00
parent bc3bb89c0a
commit add09583da
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2002-04-28 Ulrich Drepper <drepper@redhat.com> 2002-04-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/glob.c (glob): Don't pass GLOB_NOMAGIC flag to
glob_in_dir [PR libc/3385].
* posix/globtest.sh: Add test case.
* intl/loadmsgcat.c [!_LIBC] (_nl_init_domain_conv): Don't add * intl/loadmsgcat.c [!_LIBC] (_nl_init_domain_conv): Don't add
//TRANSLIT twice. //TRANSLIT twice.

13
posix/globtest.sh
View File

@@ -211,6 +211,19 @@ if test $failed -ne 0; then
result=1 result=1
fi fi
# Test NOMAGIC for subdirs
failed=0
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
${common_objpfx}posix/globtest -g "$testdir" "*/does-not-exist" |
sort > $testout
cat <<"EOF" | cmp - $testout >> $logfile || failed=1
GLOB_NOMATCH
EOF
if test $failed -ne 0; then
echo "No magic in subdir test failed" >> $logfile
result=1
fi
# Test subdirs correctly # Test subdirs correctly
failed=0 failed=0
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \ ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \

3
sysdeps/generic/glob.c
View File

@@ -929,7 +929,8 @@ glob (pattern, flags, errfunc, pglob)
old_pathc = pglob->gl_pathc; old_pathc = pglob->gl_pathc;
status = glob_in_dir (filename, dirs.gl_pathv[i], status = glob_in_dir (filename, dirs.gl_pathv[i],
((flags | GLOB_APPEND) & ~GLOB_NOCHECK), ((flags | GLOB_APPEND)
& ~(GLOB_NOCHECK | GLOB_NOMAGIC)),
errfunc, pglob); errfunc, pglob);
if (status == GLOB_NOMATCH) if (status == GLOB_NOMATCH)
/* No matches in this directory. Try the next. */ /* No matches in this directory. Try the next. */