aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-29 21:57:56 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-29 21:57:56 +0000
commit096f1151253a0bf4da9e64deefe7c99da62a6b52 (patch)
tree841a1f08f76ca1fdded22deeb470f01e4f2397f5
parent638670cd4e24cba8fdab5b7bbbe9907952397024 (diff)
downloadglibc-096f1151253a0bf4da9e64deefe7c99da62a6b52.zip
glibc-096f1151253a0bf4da9e64deefe7c99da62a6b52.tar.gz
glibc-096f1151253a0bf4da9e64deefe7c99da62a6b52.tar.bz2
Update.
2001-11-29 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/glob.c (next_brace_sub): Return NULL if braces don't match, fix {{a,b},c} globbing, clean up. Patch by Flavio Veloso <flaviovs@magnux.com>. * posix/globtest.sh: Add new tests.
-rw-r--r--ChangeLog7
-rwxr-xr-xposix/globtest.sh26
2 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 664f3c6..001612b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-29 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/generic/glob.c (next_brace_sub): Return NULL if braces
+ don't match, fix {{a,b},c} globbing, clean up.
+ Patch by Flavio Veloso <flaviovs@magnux.com>.
+ * posix/globtest.sh: Add new tests.
+
2001-11-29 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/x86_64/Versions: Add arch_prctl.
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 678a6d9..b85a8e5 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -146,6 +146,32 @@ if test $failed -ne 0; then
result=1
fi
+failed=0
+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${common_objpfx}posix/globtest -b "$testdir" "{file{1,2},-file3}" |
+sort > $testout
+cat <<"EOF" | cmp - $testout >> $logfile || failed=1
+`-file3'
+`file1'
+`file2'
+EOF
+if test $failed -ne 0; then
+ echo "Braces test 2 failed" >> $logfile
+ result=1
+fi
+
+failed=0
+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
+${common_objpfx}posix/globtest -b "$testdir" "{" |
+sort > $testout
+cat <<"EOF" | cmp - $testout >> $logfile || failed=1
+GLOB_NOMATCH
+EOF
+if test $failed -ne 0; then
+ echo "Braces test 3 failed" >> $logfile
+ result=1
+fi
+
# Test NOCHECK
failed=0
${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \