[BZ #361]
Update. 2004-09-01 Jakub Jelinek <jakub@redhat.com> [BZ #361] * posix/fnmatch_loop.c (FCT): For backslash between brackets, branch to normal_bracket after fetching the next character. * posix/tst-fnmatch.input: Add 25 new tests. Reported by Markus Oberhumer <markus@oberhumer.com>.
This commit is contained in:
parent
495639394b
commit
aae95a1b6a
|
@ -1,3 +1,11 @@
|
||||||
|
2004-09-01 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
[BZ #361]
|
||||||
|
* posix/fnmatch_loop.c (FCT): For backslash between brackets, branch
|
||||||
|
to normal_bracket after fetching the next character.
|
||||||
|
* posix/tst-fnmatch.input: Add 25 new tests.
|
||||||
|
Reported by Markus Oberhumer <markus@oberhumer.com>.
|
||||||
|
|
||||||
2004-09-01 Ulrich Drepper <drepper@redhat.com>
|
2004-09-01 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* elf/rtld.c (dl_main): First check existence of ld.so.preload
|
* elf/rtld.c (dl_main): First check existence of ld.so.preload
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2003
|
/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2003,2004
|
||||||
Free Software Foundation, Inc.
|
Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
@ -242,8 +242,7 @@ FCT (pattern, string, string_end, no_leading_period, flags)
|
||||||
c = FOLD ((UCHAR) *p);
|
c = FOLD ((UCHAR) *p);
|
||||||
++p;
|
++p;
|
||||||
|
|
||||||
if (c == fn)
|
goto normal_bracket;
|
||||||
goto matched;
|
|
||||||
}
|
}
|
||||||
else if (c == L('[') && *p == L(':'))
|
else if (c == L('[') && *p == L(':'))
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Tests for fnmatch.
|
# Tests for fnmatch.
|
||||||
# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
|
# Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
|
||||||
# This file is part of the GNU C Library.
|
# This file is part of the GNU C Library.
|
||||||
# Contributes by Ulrich Drepper <drepper@redhat.com>.
|
# Contributes by Ulrich Drepper <drepper@redhat.com>.
|
||||||
#
|
#
|
||||||
|
@ -389,6 +389,31 @@ C "az" "[-a]z" 0
|
||||||
C "bz" "[-ab]z" 0
|
C "bz" "[-ab]z" 0
|
||||||
C "cz" "[-ab]z" NOMATCH
|
C "cz" "[-ab]z" NOMATCH
|
||||||
C "-z" "[-ab]z" 0
|
C "-z" "[-ab]z" 0
|
||||||
|
C "\\" "[\\\\-a]" 0
|
||||||
|
C "_" "[\\\\-a]" 0
|
||||||
|
C "a" "[\\\\-a]" 0
|
||||||
|
C "-" "[\\\\-a]" NOMATCH
|
||||||
|
C "\\" "[\\]-a]" NOMATCH
|
||||||
|
C "_" "[\\]-a]" 0
|
||||||
|
C "a" "[\\]-a]" 0
|
||||||
|
C "]" "[\\]-a]" 0
|
||||||
|
C "-" "[\\]-a]" NOMATCH
|
||||||
|
C "\\" "[!\\\\-a]" NOMATCH
|
||||||
|
C "_" "[!\\\\-a]" NOMATCH
|
||||||
|
C "a" "[!\\\\-a]" NOMATCH
|
||||||
|
C "-" "[!\\\\-a]" 0
|
||||||
|
C "!" "[\\!-]" 0
|
||||||
|
C "-" "[\\!-]" 0
|
||||||
|
C "\\" "[\\!-]" NOMATCH
|
||||||
|
C "Z" "[Z-\\\\]" 0
|
||||||
|
C "[" "[Z-\\\\]" 0
|
||||||
|
C "\\" "[Z-\\\\]" 0
|
||||||
|
C "-" "[Z-\\\\]" NOMATCH
|
||||||
|
C "Z" "[Z-\\]]" 0
|
||||||
|
C "[" "[Z-\\]]" 0
|
||||||
|
C "\\" "[Z-\\]]" 0
|
||||||
|
C "]" "[Z-\\]]" 0
|
||||||
|
C "-" "[Z-\\]]" NOMATCH
|
||||||
|
|
||||||
# Following are tests outside the scope of IEEE 2003.2 since they are using
|
# Following are tests outside the scope of IEEE 2003.2 since they are using
|
||||||
# locales other than the C locale. The main focus of the tests is on the
|
# locales other than the C locale. The main focus of the tests is on the
|
||||||
|
|
Loading…
Reference in New Issue