summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-10-27 00:38:28 +0000
committerUlrich Drepper <drepper@redhat.com>2001-10-27 00:38:28 +0000
commitbe29c482f7aa4042f2b4eaf6a55eed299a2d94e2 (patch)
tree7c06b8c7c2ca9f398bcd834e5ef682119504f747
parentca6c73895da003ccea1b7e8ef2b32c98746812aa (diff)
Update.
* posix/fnmatch_loop.c: Recognize - at end of bracket expression correctly.
-rw-r--r--ChangeLog3
-rw-r--r--posix/fnmatch_loop.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 90bdec7a14..d34f0e0fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-10-26 Ulrich Drepper <drepper@redhat.com>
+ * posix/fnmatch_loop.c: Recognize - at end of bracket expression
+ correctly.
+
* string/strxfrm.c [USE_IN_EXTENDED_LOCALE_MODEL]: Correctly get
nrules value.
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
index 4c6168ae9f..8bdd9a6063 100644
--- a/posix/fnmatch_loop.c
+++ b/posix/fnmatch_loop.c
@@ -592,7 +592,8 @@ FCT (pattern, string, string_end, no_leading_period, flags)
/* We have to handling the symbols differently in
ranges since then the collation sequence is
important. */
- is_range = *p == L('-') && p[1] != L('\0');
+ is_range = (*p == L('-') && p[1] != L('\0')
+ && p[1] != L(']'));
if (!is_range && c == fn)
goto matched;