2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
2000-01-18 01:46:57 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
2000-01-18 01:46:57 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
|
|
|
|
2007-04-01 19:44:33 +00:00
|
|
|
struct STRUCT
|
|
|
|
{
|
|
|
|
const CHAR *pattern;
|
|
|
|
const CHAR *string;
|
|
|
|
int no_leading_period;
|
|
|
|
};
|
|
|
|
|
2000-01-18 01:46:57 +00:00
|
|
|
/* Match STRING against the filename pattern PATTERN, returning zero if
|
|
|
|
it matches, nonzero if not. */
|
|
|
|
static int FCT (const CHAR *pattern, const CHAR *string,
|
2007-04-01 19:44:33 +00:00
|
|
|
const CHAR *string_end, int no_leading_period, int flags,
|
2017-08-31 16:25:55 +00:00
|
|
|
struct STRUCT *ends, size_t alloca_used);
|
2001-03-15 09:36:19 +00:00
|
|
|
static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
|
2010-08-10 04:09:37 +00:00
|
|
|
const CHAR *string_end, int no_leading_period, int flags,
|
2017-08-31 16:25:55 +00:00
|
|
|
size_t alloca_used);
|
|
|
|
static const CHAR *END (const CHAR *patternp);
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
static int
|
2015-10-20 11:54:09 +00:00
|
|
|
FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|
|
|
int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used)
|
2000-01-18 01:46:57 +00:00
|
|
|
{
|
2013-06-07 22:24:35 +00:00
|
|
|
const CHAR *p = pattern, *n = string;
|
|
|
|
UCHAR c;
|
2000-05-24 20:22:51 +00:00
|
|
|
#ifdef _LIBC
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
const char *collseq = (const char *)
|
|
|
|
_NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQWC);
|
|
|
|
# else
|
2000-05-24 20:22:51 +00:00
|
|
|
const UCHAR *collseq = (const UCHAR *)
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
_NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQMB);
|
2000-05-24 20:22:51 +00:00
|
|
|
# endif
|
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
while ((c = *p++) != L('\0'))
|
|
|
|
{
|
2001-03-15 09:36:19 +00:00
|
|
|
int new_no_leading_period = 0;
|
2000-01-18 01:46:57 +00:00
|
|
|
c = FOLD (c);
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case L('?'):
|
2001-03-15 09:36:19 +00:00
|
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
|
|
{
|
2010-08-10 04:09:37 +00:00
|
|
|
int res = EXT (c, p, n, string_end, no_leading_period,
|
|
|
|
flags, alloca_used);
|
2001-03-15 09:36:19 +00:00
|
|
|
if (res != -1)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n == string_end)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
else if (*n == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
return FNM_NOMATCH;
|
2001-03-15 09:36:19 +00:00
|
|
|
else if (*n == L('.') && no_leading_period)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L('\\'):
|
|
|
|
if (!(flags & FNM_NOESCAPE))
|
|
|
|
{
|
|
|
|
c = *p++;
|
|
|
|
if (c == L('\0'))
|
|
|
|
/* Trailing \ loses. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
c = FOLD (c);
|
|
|
|
}
|
2001-03-15 09:36:19 +00:00
|
|
|
if (n == string_end || FOLD ((UCHAR) *n) != c)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L('*'):
|
2001-03-15 09:36:19 +00:00
|
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
|
|
{
|
2010-08-10 04:09:37 +00:00
|
|
|
int res = EXT (c, p, n, string_end, no_leading_period,
|
|
|
|
flags, alloca_used);
|
2001-03-15 09:36:19 +00:00
|
|
|
if (res != -1)
|
|
|
|
return res;
|
|
|
|
}
|
2007-04-01 19:44:33 +00:00
|
|
|
else if (ends != NULL)
|
|
|
|
{
|
|
|
|
ends->pattern = p - 1;
|
|
|
|
ends->string = n;
|
|
|
|
ends->no_leading_period = no_leading_period;
|
|
|
|
return 0;
|
|
|
|
}
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
if (n != string_end && *n == L('.') && no_leading_period)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
for (c = *p++; c == L('?') || c == L('*'); c = *p++)
|
|
|
|
{
|
2001-03-15 09:36:19 +00:00
|
|
|
if (*p == L('(') && (flags & FNM_EXTMATCH) != 0)
|
|
|
|
{
|
|
|
|
const CHAR *endp = END (p);
|
|
|
|
if (endp != p)
|
|
|
|
{
|
|
|
|
/* This is a pattern. Skip over it. */
|
|
|
|
p = endp;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == L('?'))
|
2000-01-18 01:46:57 +00:00
|
|
|
{
|
|
|
|
/* A ? needs to match one character. */
|
2001-03-15 09:36:19 +00:00
|
|
|
if (n == string_end)
|
2000-01-18 01:46:57 +00:00
|
|
|
/* There isn't another character; no match. */
|
|
|
|
return FNM_NOMATCH;
|
2001-03-15 09:36:19 +00:00
|
|
|
else if (*n == L('/')
|
|
|
|
&& __builtin_expect (flags & FNM_FILE_NAME, 0))
|
|
|
|
/* A slash does not match a wildcard under
|
|
|
|
FNM_FILE_NAME. */
|
|
|
|
return FNM_NOMATCH;
|
2000-01-18 01:46:57 +00:00
|
|
|
else
|
|
|
|
/* One character of the string is consumed in matching
|
|
|
|
this ? wildcard, so *??? won't match if there are
|
|
|
|
less than three characters. */
|
|
|
|
++n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == L('\0'))
|
|
|
|
/* The wildcard(s) is/are the last element of the pattern.
|
|
|
|
If the name is a file name and contains another slash
|
2000-10-21 07:30:28 +00:00
|
|
|
this means it cannot match, unless the FNM_LEADING_DIR
|
|
|
|
flag is set. */
|
2000-01-26 03:46:22 +00:00
|
|
|
{
|
|
|
|
int result = (flags & FNM_FILE_NAME) == 0 ? 0 : FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (flags & FNM_FILE_NAME)
|
|
|
|
{
|
|
|
|
if (flags & FNM_LEADING_DIR)
|
2000-10-21 07:30:28 +00:00
|
|
|
result = 0;
|
2000-01-26 03:46:22 +00:00
|
|
|
else
|
|
|
|
{
|
2001-03-15 09:36:19 +00:00
|
|
|
if (MEMCHR (n, L('/'), string_end - n) == NULL)
|
2000-01-26 03:46:22 +00:00
|
|
|
result = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
const CHAR *endp;
|
2007-04-01 19:44:33 +00:00
|
|
|
struct STRUCT end;
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2007-04-01 19:44:33 +00:00
|
|
|
end.pattern = NULL;
|
2001-03-15 09:36:19 +00:00
|
|
|
endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L('/') : L('\0'),
|
|
|
|
string_end - n);
|
|
|
|
if (endp == NULL)
|
|
|
|
endp = string_end;
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
if (c == L('[')
|
|
|
|
|| (__builtin_expect (flags & FNM_EXTMATCH, 0) != 0
|
2001-03-28 06:25:09 +00:00
|
|
|
&& (c == L('@') || c == L('+') || c == L('!'))
|
|
|
|
&& *p == L('(')))
|
2000-01-18 01:46:57 +00:00
|
|
|
{
|
|
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
|
|
|
2007-04-01 19:44:33 +00:00
|
|
|
for (--p; n < endp; ++n, no_leading_period = 0)
|
|
|
|
if (FCT (p, n, string_end, no_leading_period, flags2,
|
2010-08-10 04:09:37 +00:00
|
|
|
&end, alloca_used) == 0)
|
2007-04-01 19:44:33 +00:00
|
|
|
goto found;
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
|
|
|
else if (c == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
{
|
2001-03-15 09:36:19 +00:00
|
|
|
while (n < string_end && *n != L('/'))
|
2000-01-18 01:46:57 +00:00
|
|
|
++n;
|
2001-03-15 09:36:19 +00:00
|
|
|
if (n < string_end && *n == L('/')
|
2007-04-01 19:44:33 +00:00
|
|
|
&& (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags,
|
2010-08-10 04:09:37 +00:00
|
|
|
NULL, alloca_used) == 0))
|
2000-01-18 01:46:57 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
|
|
|
|
|
|
if (c == L('\\') && !(flags & FNM_NOESCAPE))
|
|
|
|
c = *p;
|
|
|
|
c = FOLD (c);
|
2007-04-01 19:44:33 +00:00
|
|
|
for (--p; n < endp; ++n, no_leading_period = 0)
|
2000-01-18 01:46:57 +00:00
|
|
|
if (FOLD ((UCHAR) *n) == c
|
2007-04-01 19:44:33 +00:00
|
|
|
&& (FCT (p, n, string_end, no_leading_period, flags2,
|
2010-08-10 04:09:37 +00:00
|
|
|
&end, alloca_used) == 0))
|
2007-04-01 19:44:33 +00:00
|
|
|
{
|
|
|
|
found:
|
|
|
|
if (end.pattern == NULL)
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (end.pattern != NULL)
|
|
|
|
{
|
|
|
|
p = end.pattern;
|
|
|
|
n = end.string;
|
|
|
|
no_leading_period = end.no_leading_period;
|
|
|
|
continue;
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we come here no match is possible with the wildcard. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
case L('['):
|
|
|
|
{
|
2000-07-04 08:22:44 +00:00
|
|
|
/* Nonzero if the sense of the character class is inverted. */
|
2011-02-04 18:35:15 +00:00
|
|
|
const CHAR *p_init = p;
|
|
|
|
const CHAR *n_init = n;
|
2013-06-07 22:24:35 +00:00
|
|
|
int not;
|
2000-01-18 01:46:57 +00:00
|
|
|
CHAR cold;
|
2001-03-15 09:36:19 +00:00
|
|
|
UCHAR fn;
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
if (posixly_correct == 0)
|
|
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
if (n == string_end)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
if (*n == L('.') && no_leading_period)
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (*n == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
/* `/' cannot be matched. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
not = (*p == L('!') || (posixly_correct < 0 && *p == L('^')));
|
|
|
|
if (not)
|
|
|
|
++p;
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
fn = FOLD ((UCHAR) *n);
|
|
|
|
|
2000-01-18 01:46:57 +00:00
|
|
|
c = *p++;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == L('\\'))
|
|
|
|
{
|
|
|
|
if (*p == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
c = FOLD ((UCHAR) *p);
|
|
|
|
++p;
|
|
|
|
|
2004-09-02 03:38:10 +00:00
|
|
|
goto normal_bracket;
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
|
|
|
else if (c == L('[') && *p == L(':'))
|
|
|
|
{
|
|
|
|
/* Leave room for the null. */
|
|
|
|
CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
|
|
|
|
size_t c1 = 0;
|
2000-05-24 20:22:51 +00:00
|
|
|
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
2000-01-18 01:46:57 +00:00
|
|
|
wctype_t wt;
|
2000-05-24 20:22:51 +00:00
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
const CHAR *startp = p;
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if (c1 == CHAR_CLASS_MAX_LENGTH)
|
|
|
|
/* The name is too long and therefore the pattern
|
|
|
|
is ill-formed. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
c = *++p;
|
|
|
|
if (c == L(':') && p[1] == L(']'))
|
|
|
|
{
|
|
|
|
p += 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c < L('a') || c >= L('z'))
|
|
|
|
{
|
|
|
|
/* This cannot possibly be a character class name.
|
|
|
|
Match it as a normal range. */
|
|
|
|
p = startp;
|
|
|
|
c = L('[');
|
|
|
|
goto normal_bracket;
|
|
|
|
}
|
|
|
|
str[c1++] = c;
|
|
|
|
}
|
|
|
|
str[c1] = L('\0');
|
|
|
|
|
2000-05-24 20:22:51 +00:00
|
|
|
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
2000-01-18 01:46:57 +00:00
|
|
|
wt = IS_CHAR_CLASS (str);
|
|
|
|
if (wt == 0)
|
|
|
|
/* Invalid character class name. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
2000-07-04 21:32:15 +00:00
|
|
|
# if defined _LIBC && ! WIDE_CHAR_VERSION
|
2000-08-02 00:09:25 +00:00
|
|
|
/* The following code is glibc specific but does
|
|
|
|
there a good job in speeding up the code since
|
|
|
|
we can avoid the btowc() call. */
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
if (_ISCTYPE ((UCHAR) *n, wt))
|
|
|
|
goto matched;
|
2000-08-02 00:09:25 +00:00
|
|
|
# else
|
|
|
|
if (ISWCTYPE (BTOWC ((UCHAR) *n), wt))
|
|
|
|
goto matched;
|
2000-07-04 21:32:15 +00:00
|
|
|
# endif
|
2000-05-24 20:22:51 +00:00
|
|
|
#else
|
2000-01-18 01:46:57 +00:00
|
|
|
if ((STREQ (str, L("alnum")) && ISALNUM ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("alpha")) && ISALPHA ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("blank")) && ISBLANK ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("cntrl")) && ISCNTRL ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("digit")) && ISDIGIT ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("graph")) && ISGRAPH ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("lower")) && ISLOWER ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("print")) && ISPRINT ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("punct")) && ISPUNCT ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("space")) && ISSPACE ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("upper")) && ISUPPER ((UCHAR) *n))
|
|
|
|
|| (STREQ (str, L("xdigit")) && ISXDIGIT ((UCHAR) *n)))
|
|
|
|
goto matched;
|
2000-05-24 20:22:51 +00:00
|
|
|
#endif
|
2000-07-04 08:22:44 +00:00
|
|
|
c = *p++;
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
2000-07-04 23:27:39 +00:00
|
|
|
#ifdef _LIBC
|
|
|
|
else if (c == L('[') && *p == L('='))
|
|
|
|
{
|
2014-11-25 22:12:48 +00:00
|
|
|
/* It's important that STR be a scalar variable rather
|
|
|
|
than a one-element array, because GCC (at least 4.9.2
|
|
|
|
-O2 on x86-64) can be confused by the array and
|
|
|
|
diagnose a "used initialized" in a dead branch in the
|
|
|
|
findidx function. */
|
|
|
|
UCHAR str;
|
2000-07-04 23:27:39 +00:00
|
|
|
uint32_t nrules =
|
|
|
|
_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
|
|
const CHAR *startp = p;
|
|
|
|
|
|
|
|
c = *++p;
|
|
|
|
if (c == L('\0'))
|
|
|
|
{
|
|
|
|
p = startp;
|
|
|
|
c = L('[');
|
|
|
|
goto normal_bracket;
|
|
|
|
}
|
2014-11-25 22:12:48 +00:00
|
|
|
str = c;
|
2000-07-04 23:27:39 +00:00
|
|
|
|
|
|
|
c = *++p;
|
|
|
|
if (c != L('=') || p[1] != L(']'))
|
|
|
|
{
|
|
|
|
p = startp;
|
|
|
|
c = L('[');
|
|
|
|
goto normal_bracket;
|
|
|
|
}
|
|
|
|
p += 2;
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
2014-11-25 22:12:48 +00:00
|
|
|
if ((UCHAR) *n == str)
|
2000-07-04 23:27:39 +00:00
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const int32_t *table;
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
const int32_t *weights;
|
2014-09-11 23:02:17 +00:00
|
|
|
const wint_t *extra;
|
2000-07-04 23:27:39 +00:00
|
|
|
# else
|
|
|
|
const unsigned char *weights;
|
|
|
|
const unsigned char *extra;
|
|
|
|
# endif
|
|
|
|
const int32_t *indirect;
|
|
|
|
int32_t idx;
|
2014-11-25 22:12:48 +00:00
|
|
|
const UCHAR *cp = (const UCHAR *) &str;
|
2000-07-04 23:27:39 +00:00
|
|
|
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
table = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC);
|
|
|
|
weights = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTWC);
|
2014-09-11 23:02:17 +00:00
|
|
|
extra = (const wint_t *)
|
2000-07-04 23:27:39 +00:00
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAWC);
|
|
|
|
indirect = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTWC);
|
|
|
|
# else
|
|
|
|
table = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
|
|
|
|
weights = (const unsigned char *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
|
|
|
|
extra = (const unsigned char *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
|
|
|
|
indirect = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
|
|
|
|
# endif
|
|
|
|
|
2014-09-11 23:02:17 +00:00
|
|
|
idx = FINDIDX (table, indirect, extra, &cp, 1);
|
2000-07-04 23:27:39 +00:00
|
|
|
if (idx != 0)
|
|
|
|
{
|
|
|
|
/* We found a table entry. Now see whether the
|
|
|
|
character we are currently at has the same
|
|
|
|
equivalance class value. */
|
2007-10-12 17:47:19 +00:00
|
|
|
int len = weights[idx & 0xffffff];
|
2000-07-04 23:27:39 +00:00
|
|
|
int32_t idx2;
|
|
|
|
const UCHAR *np = (const UCHAR *) n;
|
|
|
|
|
2014-09-11 23:02:17 +00:00
|
|
|
idx2 = FINDIDX (table, indirect, extra,
|
|
|
|
&np, string_end - n);
|
2007-10-12 17:47:19 +00:00
|
|
|
if (idx2 != 0
|
|
|
|
&& (idx >> 24) == (idx2 >> 24)
|
|
|
|
&& len == weights[idx2 & 0xffffff])
|
2000-07-04 23:27:39 +00:00
|
|
|
{
|
|
|
|
int cnt = 0;
|
|
|
|
|
2007-10-12 17:47:19 +00:00
|
|
|
idx &= 0xffffff;
|
|
|
|
idx2 &= 0xffffff;
|
|
|
|
|
2000-07-04 23:27:39 +00:00
|
|
|
while (cnt < len
|
|
|
|
&& (weights[idx + 1 + cnt]
|
|
|
|
== weights[idx2 + 1 + cnt]))
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
if (cnt == len)
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
else if (c == L('\0'))
|
2011-01-14 13:06:22 +00:00
|
|
|
{
|
|
|
|
/* [ unterminated, treat as normal character. */
|
|
|
|
p = p_init;
|
|
|
|
n = n_init;
|
|
|
|
c = L('[');
|
|
|
|
goto normal_match;
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
else
|
|
|
|
{
|
2000-07-05 22:02:03 +00:00
|
|
|
int is_range = 0;
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2000-07-05 22:02:03 +00:00
|
|
|
#ifdef _LIBC
|
2000-07-26 16:04:48 +00:00
|
|
|
int is_seqval = 0;
|
|
|
|
|
2000-07-05 22:02:03 +00:00
|
|
|
if (c == L('[') && *p == L('.'))
|
|
|
|
{
|
|
|
|
uint32_t nrules =
|
|
|
|
_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
|
|
const CHAR *startp = p;
|
|
|
|
size_t c1 = 0;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = *++p;
|
|
|
|
if (c == L('.') && p[1] == L(']'))
|
|
|
|
{
|
|
|
|
p += 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c == '\0')
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
++c1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We have to handling the symbols differently in
|
|
|
|
ranges since then the collation sequence is
|
|
|
|
important. */
|
|
|
|
is_range = *p == L('-') && p[1] != L('\0');
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
|
|
|
/* There are no names defined in the collation
|
|
|
|
data. Therefore we only accept the trivial
|
|
|
|
names consisting of the character itself. */
|
|
|
|
if (c1 != 1)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (!is_range && *n == startp[1])
|
|
|
|
goto matched;
|
|
|
|
|
|
|
|
cold = startp[1];
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int32_t table_size;
|
|
|
|
const int32_t *symb_table;
|
|
|
|
const unsigned char *extra;
|
|
|
|
int32_t idx;
|
|
|
|
int32_t elem;
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2014-09-16 09:17:04 +00:00
|
|
|
CHAR *wextra;
|
|
|
|
# endif
|
2000-07-05 22:02:03 +00:00
|
|
|
|
|
|
|
table_size =
|
|
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_HASH_SIZEMB);
|
|
|
|
symb_table = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_TABLEMB);
|
|
|
|
extra = (const unsigned char *)
|
|
|
|
_NL_CURRENT (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_EXTRAMB);
|
|
|
|
|
2014-09-16 09:17:04 +00:00
|
|
|
for (elem = 0; elem < table_size; elem++)
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
/* Skip the name of collating element. */
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
/* Skip the byte sequence of the
|
|
|
|
collating element. */
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~3;
|
|
|
|
|
|
|
|
wextra = (CHAR *) &extra[idx + 4];
|
|
|
|
|
|
|
|
if (/* Compare the length of the sequence. */
|
|
|
|
c1 == wextra[0]
|
|
|
|
/* Compare the wide char sequence. */
|
|
|
|
&& WMEMCMP (startp + 1, &wextra[1],
|
|
|
|
c1) == 0)
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
break;
|
|
|
|
# else
|
|
|
|
if (/* Compare the length of the sequence. */
|
|
|
|
c1 == extra[idx]
|
|
|
|
/* Compare the byte sequence. */
|
|
|
|
&& memcmp (startp + 1,
|
|
|
|
&extra[idx + 1], c1) == 0)
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
break;
|
|
|
|
# endif
|
|
|
|
}
|
2000-07-05 22:02:03 +00:00
|
|
|
|
2014-09-16 09:17:04 +00:00
|
|
|
if (elem < table_size)
|
2000-07-05 22:02:03 +00:00
|
|
|
{
|
|
|
|
/* Compare the byte sequence but only if
|
|
|
|
this is not part of a range. */
|
2014-09-16 09:17:04 +00:00
|
|
|
if (! is_range
|
2000-07-05 22:02:03 +00:00
|
|
|
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2014-09-16 09:17:04 +00:00
|
|
|
&& WMEMCMP (n, &wextra[1], c1) == 0
|
2000-07-05 22:02:03 +00:00
|
|
|
# else
|
2014-09-16 09:17:04 +00:00
|
|
|
&& memcmp (n, &extra[idx + 1], c1) == 0
|
2000-07-05 22:02:03 +00:00
|
|
|
# endif
|
2014-09-16 09:17:04 +00:00
|
|
|
)
|
|
|
|
{
|
|
|
|
n += c1 - 1;
|
|
|
|
goto matched;
|
2000-07-05 22:02:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the collation sequence value. */
|
|
|
|
is_seqval = 1;
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2000-07-05 22:02:03 +00:00
|
|
|
cold = wextra[1 + wextra[idx]];
|
|
|
|
# else
|
|
|
|
idx += 1 + extra[idx];
|
2014-09-16 09:17:04 +00:00
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~3;
|
2000-07-05 22:02:03 +00:00
|
|
|
cold = *((int32_t *) &extra[idx]);
|
|
|
|
# endif
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
}
|
2001-02-01 07:28:23 +00:00
|
|
|
else if (c1 == 1)
|
2000-07-05 22:02:03 +00:00
|
|
|
{
|
|
|
|
/* No valid character. Match it as a
|
|
|
|
single byte. */
|
2014-09-16 09:17:04 +00:00
|
|
|
if (!is_range && *n == startp[1])
|
2000-07-05 22:02:03 +00:00
|
|
|
goto matched;
|
|
|
|
|
2014-09-16 09:17:04 +00:00
|
|
|
cold = startp[1];
|
2000-07-05 22:02:03 +00:00
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
c = FOLD (c);
|
|
|
|
normal_bracket:
|
|
|
|
|
|
|
|
/* We have to handling the symbols differently in
|
|
|
|
ranges since then the collation sequence is
|
|
|
|
important. */
|
2001-10-27 00:38:28 +00:00
|
|
|
is_range = (*p == L('-') && p[1] != L('\0')
|
|
|
|
&& p[1] != L(']'));
|
2000-07-05 22:02:03 +00:00
|
|
|
|
|
|
|
if (!is_range && c == fn)
|
|
|
|
goto matched;
|
|
|
|
|
2004-12-01 19:55:58 +00:00
|
|
|
/* This is needed if we goto normal_bracket; from
|
|
|
|
outside of is_seqval's scope. */
|
|
|
|
is_seqval = 0;
|
2000-07-05 22:02:03 +00:00
|
|
|
cold = c;
|
|
|
|
c = *p++;
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
if (c == L('-') && *p != L(']'))
|
|
|
|
{
|
2000-05-24 20:22:51 +00:00
|
|
|
#if _LIBC
|
|
|
|
/* We have to find the collation sequence
|
|
|
|
value for C. Collation sequence is nothing
|
|
|
|
we can regularly access. The sequence
|
|
|
|
value is defined by the order in which the
|
|
|
|
definitions of the collation values for the
|
|
|
|
various characters appear in the source
|
|
|
|
file. A strange concept, nowhere
|
|
|
|
documented. */
|
2000-07-05 22:02:03 +00:00
|
|
|
uint32_t fcollseq;
|
|
|
|
uint32_t lcollseq;
|
2000-01-18 01:46:57 +00:00
|
|
|
UCHAR cend = *p++;
|
2000-05-24 20:22:51 +00:00
|
|
|
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2000-05-24 20:22:51 +00:00
|
|
|
/* Search in the `names' array for the characters. */
|
2003-06-13 21:05:42 +00:00
|
|
|
fcollseq = __collseq_table_lookup (collseq, fn);
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
if (fcollseq == ~((uint32_t) 0))
|
|
|
|
/* XXX We don't know anything about the character
|
|
|
|
we are supposed to match. This means we are
|
|
|
|
failing. */
|
|
|
|
goto range_not_matched;
|
2000-07-05 22:02:03 +00:00
|
|
|
|
|
|
|
if (is_seqval)
|
|
|
|
lcollseq = cold;
|
|
|
|
else
|
2003-06-13 21:05:42 +00:00
|
|
|
lcollseq = __collseq_table_lookup (collseq, cold);
|
2000-05-24 20:22:51 +00:00
|
|
|
# else
|
2000-07-05 22:02:03 +00:00
|
|
|
fcollseq = collseq[fn];
|
|
|
|
lcollseq = is_seqval ? cold : collseq[(UCHAR) cold];
|
|
|
|
# endif
|
|
|
|
|
|
|
|
is_seqval = 0;
|
|
|
|
if (cend == L('[') && *p == L('.'))
|
|
|
|
{
|
|
|
|
uint32_t nrules =
|
|
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
|
|
_NL_COLLATE_NRULES);
|
|
|
|
const CHAR *startp = p;
|
|
|
|
size_t c1 = 0;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = *++p;
|
|
|
|
if (c == L('.') && p[1] == L(']'))
|
|
|
|
{
|
|
|
|
p += 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (c == '\0')
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
++c1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
|
|
|
/* There are no names defined in the
|
|
|
|
collation data. Therefore we only
|
|
|
|
accept the trivial names consisting
|
|
|
|
of the character itself. */
|
|
|
|
if (c1 != 1)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
cend = startp[1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int32_t table_size;
|
|
|
|
const int32_t *symb_table;
|
|
|
|
const unsigned char *extra;
|
|
|
|
int32_t idx;
|
|
|
|
int32_t elem;
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2014-09-16 09:17:04 +00:00
|
|
|
CHAR *wextra;
|
2001-01-22 17:05:26 +00:00
|
|
|
# endif
|
2000-07-05 22:02:03 +00:00
|
|
|
|
|
|
|
table_size =
|
|
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_HASH_SIZEMB);
|
|
|
|
symb_table = (const int32_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_TABLEMB);
|
|
|
|
extra = (const unsigned char *)
|
|
|
|
_NL_CURRENT (LC_COLLATE,
|
|
|
|
_NL_COLLATE_SYMB_EXTRAMB);
|
|
|
|
|
2014-09-16 09:17:04 +00:00
|
|
|
for (elem = 0; elem < table_size; elem++)
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
/* Skip the name of collating
|
|
|
|
element. */
|
|
|
|
idx += 1 + extra[idx];
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2014-09-16 09:17:04 +00:00
|
|
|
/* Skip the byte sequence of the
|
|
|
|
collating element. */
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~3;
|
|
|
|
|
|
|
|
wextra = (CHAR *) &extra[idx + 4];
|
|
|
|
|
|
|
|
if (/* Compare the length of the
|
|
|
|
sequence. */
|
|
|
|
c1 == wextra[0]
|
|
|
|
/* Compare the wide char sequence. */
|
|
|
|
&& WMEMCMP (startp + 1, &wextra[1],
|
|
|
|
c1) == 0)
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
break;
|
|
|
|
# else
|
|
|
|
if (/* Compare the length of the
|
|
|
|
sequence. */
|
|
|
|
c1 == extra[idx]
|
|
|
|
/* Compare the byte sequence. */
|
|
|
|
&& memcmp (startp + 1,
|
|
|
|
&extra[idx + 1], c1) == 0)
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
break;
|
2000-07-05 22:02:03 +00:00
|
|
|
# endif
|
2014-09-16 09:17:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (elem < table_size)
|
|
|
|
{
|
2000-07-05 22:02:03 +00:00
|
|
|
/* Get the collation sequence value. */
|
|
|
|
is_seqval = 1;
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2000-07-05 22:02:03 +00:00
|
|
|
cend = wextra[1 + wextra[idx]];
|
|
|
|
# else
|
|
|
|
idx += 1 + extra[idx];
|
2014-09-16 09:17:04 +00:00
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~3;
|
2000-07-05 22:02:03 +00:00
|
|
|
cend = *((int32_t *) &extra[idx]);
|
|
|
|
# endif
|
|
|
|
}
|
2014-09-16 09:17:04 +00:00
|
|
|
else if (c1 == 1)
|
2000-07-05 22:02:03 +00:00
|
|
|
{
|
2014-09-16 09:17:04 +00:00
|
|
|
cend = startp[1];
|
2000-07-05 22:02:03 +00:00
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!(flags & FNM_NOESCAPE) && cend == L('\\'))
|
|
|
|
cend = *p++;
|
|
|
|
if (cend == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
cend = FOLD (cend);
|
|
|
|
}
|
2000-05-24 20:22:51 +00:00
|
|
|
|
|
|
|
/* XXX It is not entirely clear to me how to handle
|
|
|
|
characters which are not mentioned in the
|
|
|
|
collation specification. */
|
|
|
|
if (
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2000-07-05 22:02:03 +00:00
|
|
|
lcollseq == 0xffffffff ||
|
2000-05-24 20:22:51 +00:00
|
|
|
# endif
|
2000-07-05 22:02:03 +00:00
|
|
|
lcollseq <= fcollseq)
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
|
|
|
/* We have to look at the upper bound. */
|
2000-07-05 22:02:03 +00:00
|
|
|
uint32_t hcollseq;
|
2000-05-24 20:22:51 +00:00
|
|
|
|
2000-07-05 22:02:03 +00:00
|
|
|
if (is_seqval)
|
|
|
|
hcollseq = cend;
|
|
|
|
else
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
hcollseq =
|
2003-06-13 21:05:42 +00:00
|
|
|
__collseq_table_lookup (collseq, cend);
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
if (hcollseq == ~((uint32_t) 0))
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
/* Hum, no information about the upper
|
|
|
|
bound. The matching succeeds if the
|
|
|
|
lower bound is matched exactly. */
|
|
|
|
if (lcollseq != fcollseq)
|
|
|
|
goto range_not_matched;
|
Update.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
If nrules == 0 and srclen < n, copy only srclen + 1 characters.
* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
If the result is fits in the buffer, copy only as many bytes as needed.
* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
buffer after copying numbuf into it.
* sysdeps/mach/_strerror.c (__strerror_r): Likewise.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* posix/confstr.c (confstr): When string_len > len, NUL-terminate
the result. When string_len < len, don't clear the rest of the buffer.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
Support for new LC_COLLATE format.
* locale/coll-lookup.h: New file.
* locale/weightwc.h (findidx): When size == 0, call
collidx_table_lookup.
* wcsmbs/wcscoll.c: Include coll-lookup.h.
* wcsmbs/wcsxfrm.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
collseq_table_lookup.
* locale/programs/3level.h: New file.
* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
by including "3level.h".
* locale/programs/ld-collate.c (wchead_table, collidx_table,
collseq_table): New types, defined by including "3level.h".
(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
(encoding_mask, encoding_byte): Remove.
(utf8_encode): Use simple shifts instead.
(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
(collate_output): New local variable tablewc_3level. When
!oldstyle_tables, set table_size to 0 and names to NULL and fill
tablewc_3level instead of tablewc. Change format of TABLEWC and
COLLSEQWC entries written to the file.
* locale/C-collate.c (collseqwc): Change format.
(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
of COLLSEQWC.
* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
(locale_ctype_t): New charnames_idx field.
(ctype_startup): Initialize charnames_idx field.
(find_idx): Speed up dramatically by using charnames_idx inverse table.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* locale/C-ctype.c: Switch to new locale format.
(_nl_C_LC_CTYPE_names): Remove array.
(STRUCT_CTYPE_CLASS): New macro.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New three-level tables.
(_nl_C_LC_CTYPE_width): Change from array to three-level table.
(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
12 class tables and 2 map tables at the end.
* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
New declarations.
(b): Remove trailing semicolon.
(__ctype_names, __ctype_width): Don't initialize.
(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.
2000-08-27 Bruno Haible <haible@clisp.cons.org>
* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
is guaranteed to be allocated with the same malloc() and may be
passed to free().
(_dl_map_object): Update open_path calls. If rtld_search_dirs has
been set to empty by an earlier open_path call, don't pass it again.
2000-08-29 01:20:23 +00:00
|
|
|
|
Update.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* wctype/wcfuncs.c (iswblank): New function.
* wctype/wcfuncs_l.c (__iswblank_l): New function.
* wctype/wcextra.c: Remove file.
* wctype/wcextra_l.c: Remove file.
* wctype/Makefile (distribute): Remove wcextra and wcextra_l.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (collate_output): Remove redundant
assert call.
* string/strcoll.c: Likewise.
* string/strxfrm.c: Include assert.h. Add assert calls like in
string/strcoll.c.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/categories.def (_NL_COLLATE_HASH_SIZE,
_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_NAMES, _NL_CTYPE_NAMES,
_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Remove definitions.
* locale/langinfo.h (_NL_COLLATE_HASH_SIZE, _NL_COLLATE_HASH_LAYERS,
_NL_COLLATE_NAMES): Rename to _NL_COLLATE_GAP1/2/3 respectively.
(_NL_CTYPE_NAMES): Rename to _NL_CTYPE_GAP3.
(_NL_CTYPE_GAP3): Rename to _NL_CTYPE_GAP4.
(_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS): Rename to
_NL_CTYPE_GAP5/6 respectively.
* locale/C-ctype.c (_nl_C_LC_CTYPE): Update.
* ctype/ctype-info.c (__ctype_names, __ctype_width): Remove variables.
* locale/lc-ctype.c (_nl_postload_ctype): Assume new locale format.
Don't initialize __ctype_names and __ctype_width.
* wctype/cname-lookup.h: Remove file.
* wctype/Makefile (distribute): Remove cname-lookup.h.
* wctype/wchar-lookup.h: Include stdint.h.
* wctype/wctype.c (__wctype): Assume new locale format.
* wctype/wctype_l.c (__wctype_l): Likewise.
* wctype/iswctype.c: Don't include cname-lookup.h.
(__iswctype): Assume new locale format.
* wctype/iswctype_l.c: Don't include cname-lookup.h.
(__iswctype_l): Assume new locale format.
* wctype/wctrans.c: Don't include ctype.h.
(wctrans): Assume new locale format.
* wctype/wctrans_l.c (__wctrans_l): Likewise.
* wctype/towctrans.c: Don't include cname-lookup.h.
(__towctrans): Assume new locale format.
* wctype/towctrans_l.c: Don't include cname-lookup.h.
(__towctrans_l): Assume new locale format.
* wctype/wcfuncs.c: Don't include ctype.h and cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__ctype32_b, __ctype32_toupper, __ctype32_tolower): Remove
declarations.
(iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint,
iswpunct, iswspace, iswupper, iswxdigit): Assume new locale format.
(towlower, towupper): Likewise.
* wctype/wcfuncs_l.c: Don't include cname-lookup.h. Include
localeinfo.h instead.
(__NO_WCTYPE): Remove unused macro.
(__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l,
__iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l,
__iswxdigit_l): Assume new locale format.
(__towlower_l, __towupper_l): Likewise.
* wcsmbs/wcwidth.h: Don't include cname-lookup.h.
(__ctype32_b): Remove declaration.
(internal_wcwidth): Assume new locale format.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Remove fields
plane_size, plane_cnt, names, width. Rename map to map_b, rename map32
to map32_b, rename width_3level to width.
(ctype_output): Always create new locale format. Don't emit
_NL_CTYPE_NAMES, _NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS any more.
(allocate_arrays): Always create new locale format.
* locale/C-collate.c (_nl_C_LC_COLLATE): Update.
* locale/weightwc.h (findidx): Assume new locale format.
* string/strcoll.c (wcscoll): Remove local variables size, layers,
names.
* string/strxfrm.c (wcsxfrm): Likewise.
* posix/fnmatch_loop.c (internal_fnwmatch): Likewise. Change type of
local variable collseq to 'const char *'.
(SUFFIX): Don't use, don't undefine.
* posix/fnmatch.c: Remove SUFFIX definition.
* locale/programs/ld-collate.c (struct locale_collate_t): Remove
fields plane_size, plane_cnt, wcheads, wcseqorder. Rename
wcheads_3level to wcheads, rename wcseqorder_3level to wcseqorder.
(collate_finish): Always create new locale format. Remove local
variables min_total, act_size.
(collate_output): Always create new locale format. Remove local
variables table_size, names, tablewc. Rename tablewc_3level to
tablewc.
2000-08-31 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-collate.c (obstack_int32_grow,
obstack_int32_grow_fast): New inline functions.
(output_weightwc, collate_output): Use them where possible.
2000-09-01 19:36:44 +00:00
|
|
|
goto matched;
|
2000-05-24 20:22:51 +00:00
|
|
|
}
|
|
|
|
# else
|
2000-07-05 22:02:03 +00:00
|
|
|
hcollseq = collseq[cend];
|
2000-05-24 20:22:51 +00:00
|
|
|
# endif
|
2000-07-05 22:02:03 +00:00
|
|
|
}
|
2000-05-24 20:22:51 +00:00
|
|
|
|
2000-07-05 22:02:03 +00:00
|
|
|
if (lcollseq <= hcollseq && fcollseq <= hcollseq)
|
2000-01-26 02:20:01 +00:00
|
|
|
goto matched;
|
|
|
|
}
|
2014-06-26 15:10:46 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
2000-05-24 20:22:51 +00:00
|
|
|
range_not_matched:
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
/* We use a boring value comparison of the character
|
|
|
|
values. This is better than comparing using
|
|
|
|
`strcoll' since the latter would have surprising
|
|
|
|
and sometimes fatal consequences. */
|
|
|
|
UCHAR cend = *p++;
|
|
|
|
|
|
|
|
if (!(flags & FNM_NOESCAPE) && cend == L('\\'))
|
|
|
|
cend = *p++;
|
|
|
|
if (cend == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
/* It is a range. */
|
2001-02-22 01:21:50 +00:00
|
|
|
if (cold <= fn && fn <= cend)
|
2000-05-24 20:22:51 +00:00
|
|
|
goto matched;
|
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == L(']'))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!not)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
matched:
|
|
|
|
/* Skip the rest of the [...] that already matched. */
|
2014-06-18 09:58:45 +00:00
|
|
|
while ((c = *p++) != L (']'))
|
2000-01-18 01:46:57 +00:00
|
|
|
{
|
|
|
|
if (c == L('\0'))
|
|
|
|
/* [... (unterminated) loses. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == L('\\'))
|
|
|
|
{
|
|
|
|
if (*p == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
/* XXX 1003.2d11 is unclear if this is right. */
|
|
|
|
++p;
|
|
|
|
}
|
|
|
|
else if (c == L('[') && *p == L(':'))
|
|
|
|
{
|
2000-07-05 22:02:03 +00:00
|
|
|
int c1 = 0;
|
|
|
|
const CHAR *startp = p;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = *++p;
|
|
|
|
if (++c1 == CHAR_CLASS_MAX_LENGTH)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (*p == L(':') && p[1] == L(']'))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (c < L('a') || c >= L('z'))
|
|
|
|
{
|
2014-06-18 09:58:45 +00:00
|
|
|
p = startp - 2;
|
|
|
|
break;
|
2000-07-05 22:02:03 +00:00
|
|
|
}
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
p += 2;
|
2000-07-05 22:02:03 +00:00
|
|
|
}
|
|
|
|
else if (c == L('[') && *p == L('='))
|
|
|
|
{
|
|
|
|
c = *++p;
|
|
|
|
if (c == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
c = *++p;
|
|
|
|
if (c != L('=') || p[1] != L(']'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
p += 2;
|
|
|
|
}
|
|
|
|
else if (c == L('[') && *p == L('.'))
|
|
|
|
{
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = *++p;
|
2015-02-26 13:55:24 +00:00
|
|
|
if (c == L('\0'))
|
2000-07-05 22:02:03 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
2015-02-26 13:55:24 +00:00
|
|
|
if (c == L('.') && p[1] == L(']'))
|
2000-07-05 22:02:03 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
p += 2;
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (not)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
case L('+'):
|
|
|
|
case L('@'):
|
|
|
|
case L('!'):
|
|
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
|
|
{
|
2010-08-10 04:09:37 +00:00
|
|
|
int res = EXT (c, p, n, string_end, no_leading_period, flags,
|
|
|
|
alloca_used);
|
2001-03-15 09:36:19 +00:00
|
|
|
if (res != -1)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
goto normal_match;
|
|
|
|
|
|
|
|
case L('/'):
|
|
|
|
if (NO_LEADING_PERIOD (flags))
|
|
|
|
{
|
2003-03-16 03:22:41 +00:00
|
|
|
if (n == string_end || c != (UCHAR) *n)
|
2001-03-15 09:36:19 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
new_no_leading_period = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHROUGH */
|
2000-01-18 01:46:57 +00:00
|
|
|
default:
|
2001-03-15 09:36:19 +00:00
|
|
|
normal_match:
|
|
|
|
if (n == string_end || c != FOLD ((UCHAR) *n))
|
2000-01-18 01:46:57 +00:00
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
no_leading_period = new_no_leading_period;
|
2000-01-18 01:46:57 +00:00
|
|
|
++n;
|
|
|
|
}
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
if (n == string_end)
|
2000-01-18 01:46:57 +00:00
|
|
|
return 0;
|
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
if ((flags & FNM_LEADING_DIR) && n != string_end && *n == L('/'))
|
2000-01-18 01:46:57 +00:00
|
|
|
/* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return FNM_NOMATCH;
|
2000-01-19 02:23:18 +00:00
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
static const CHAR *
|
|
|
|
END (const CHAR *pattern)
|
|
|
|
{
|
|
|
|
const CHAR *p = pattern;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
if (*++p == L('\0'))
|
|
|
|
/* This is an invalid pattern. */
|
|
|
|
return pattern;
|
|
|
|
else if (*p == L('['))
|
|
|
|
{
|
|
|
|
/* Handle brackets special. */
|
|
|
|
if (posixly_correct == 0)
|
|
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
|
|
|
|
/* Skip the not sign. We have to recognize it because of a possibly
|
|
|
|
following ']'. */
|
|
|
|
if (*++p == L('!') || (posixly_correct < 0 && *p == L('^')))
|
|
|
|
++p;
|
|
|
|
/* A leading ']' is recognized as such. */
|
|
|
|
if (*p == L(']'))
|
|
|
|
++p;
|
|
|
|
/* Skip over all characters of the list. */
|
|
|
|
while (*p != L(']'))
|
|
|
|
if (*p++ == L('\0'))
|
|
|
|
/* This is no valid pattern. */
|
|
|
|
return pattern;
|
|
|
|
}
|
|
|
|
else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
|
|
|
|
|| *p == L('!')) && p[1] == L('('))
|
2015-03-02 21:34:22 +00:00
|
|
|
{
|
|
|
|
p = END (p + 1);
|
|
|
|
if (*p == L('\0'))
|
|
|
|
/* This is an invalid pattern. */
|
|
|
|
return pattern;
|
|
|
|
}
|
2001-03-15 09:36:19 +00:00
|
|
|
else if (*p == L(')'))
|
|
|
|
break;
|
|
|
|
|
|
|
|
return p + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
2010-08-10 04:09:37 +00:00
|
|
|
int no_leading_period, int flags, size_t alloca_used)
|
2001-03-15 09:36:19 +00:00
|
|
|
{
|
|
|
|
const CHAR *startp;
|
|
|
|
int level;
|
|
|
|
struct patternlist
|
|
|
|
{
|
|
|
|
struct patternlist *next;
|
2010-08-10 04:09:37 +00:00
|
|
|
CHAR malloced;
|
2001-03-15 09:36:19 +00:00
|
|
|
CHAR str[0];
|
|
|
|
} *list = NULL;
|
|
|
|
struct patternlist **lastp = &list;
|
2001-03-15 20:04:25 +00:00
|
|
|
size_t pattern_len = STRLEN (pattern);
|
2010-08-10 04:09:37 +00:00
|
|
|
int any_malloced = 0;
|
2001-03-15 09:36:19 +00:00
|
|
|
const CHAR *p;
|
|
|
|
const CHAR *rs;
|
2010-08-10 04:09:37 +00:00
|
|
|
int retval = 0;
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
/* Parse the pattern. Store the individual parts in the list. */
|
|
|
|
level = 0;
|
|
|
|
for (startp = p = pattern + 1; level >= 0; ++p)
|
|
|
|
if (*p == L('\0'))
|
2010-08-10 04:09:37 +00:00
|
|
|
{
|
|
|
|
/* This is an invalid pattern. */
|
|
|
|
retval = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
2001-03-15 09:36:19 +00:00
|
|
|
else if (*p == L('['))
|
|
|
|
{
|
|
|
|
/* Handle brackets special. */
|
|
|
|
if (posixly_correct == 0)
|
|
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
|
|
|
|
/* Skip the not sign. We have to recognize it because of a possibly
|
|
|
|
following ']'. */
|
|
|
|
if (*++p == L('!') || (posixly_correct < 0 && *p == L('^')))
|
|
|
|
++p;
|
|
|
|
/* A leading ']' is recognized as such. */
|
|
|
|
if (*p == L(']'))
|
|
|
|
++p;
|
|
|
|
/* Skip over all characters of the list. */
|
|
|
|
while (*p != L(']'))
|
|
|
|
if (*p++ == L('\0'))
|
2010-08-10 04:09:37 +00:00
|
|
|
{
|
|
|
|
/* This is no valid pattern. */
|
|
|
|
retval = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
2001-03-15 09:36:19 +00:00
|
|
|
}
|
|
|
|
else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
|
|
|
|
|| *p == L('!')) && p[1] == L('('))
|
|
|
|
/* Remember the nesting level. */
|
|
|
|
++level;
|
|
|
|
else if (*p == L(')'))
|
|
|
|
{
|
|
|
|
if (level-- == 0)
|
|
|
|
{
|
|
|
|
/* This means we found the end of the pattern. */
|
|
|
|
#define NEW_PATTERN \
|
2001-03-15 20:04:25 +00:00
|
|
|
struct patternlist *newp; \
|
2010-08-10 04:09:37 +00:00
|
|
|
size_t slen = (opt == L('?') || opt == L('@') \
|
|
|
|
? pattern_len : (p - startp + 1)); \
|
|
|
|
slen = sizeof (struct patternlist) + (slen * sizeof (CHAR)); \
|
|
|
|
int malloced = ! __libc_use_alloca (alloca_used + slen); \
|
|
|
|
if (__builtin_expect (malloced, 0)) \
|
|
|
|
{ \
|
|
|
|
newp = malloc (slen); \
|
|
|
|
if (newp == NULL) \
|
|
|
|
{ \
|
|
|
|
retval = -2; \
|
|
|
|
goto out; \
|
|
|
|
} \
|
2010-11-12 08:51:28 +00:00
|
|
|
any_malloced = 1; \
|
2010-08-10 04:09:37 +00:00
|
|
|
} \
|
2010-11-12 08:51:28 +00:00
|
|
|
else \
|
|
|
|
newp = alloca_account (slen, alloca_used); \
|
2001-03-15 09:36:19 +00:00
|
|
|
newp->next = NULL; \
|
2010-08-10 04:09:37 +00:00
|
|
|
newp->malloced = malloced; \
|
|
|
|
*((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L('\0'); \
|
2001-03-15 09:36:19 +00:00
|
|
|
*lastp = newp; \
|
|
|
|
lastp = &newp->next
|
|
|
|
NEW_PATTERN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (*p == L('|'))
|
|
|
|
{
|
|
|
|
if (level == 0)
|
|
|
|
{
|
|
|
|
NEW_PATTERN;
|
|
|
|
startp = p + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert (list != NULL);
|
|
|
|
assert (p[-1] == L(')'));
|
2001-04-05 02:51:34 +00:00
|
|
|
#undef NEW_PATTERN
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
switch (opt)
|
|
|
|
{
|
|
|
|
case L('*'):
|
2010-08-10 04:09:37 +00:00
|
|
|
if (FCT (p, string, string_end, no_leading_period, flags, NULL,
|
|
|
|
alloca_used) == 0)
|
|
|
|
goto success;
|
2001-03-15 09:36:19 +00:00
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
|
|
|
case L('+'):
|
|
|
|
do
|
|
|
|
{
|
|
|
|
for (rs = string; rs <= string_end; ++rs)
|
|
|
|
/* First match the prefix with the current pattern with the
|
|
|
|
current pattern. */
|
|
|
|
if (FCT (list->str, string, rs, no_leading_period,
|
2007-04-01 19:44:33 +00:00
|
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
2010-08-10 04:09:37 +00:00
|
|
|
NULL, alloca_used) == 0
|
2001-03-15 09:36:19 +00:00
|
|
|
/* This was successful. Now match the rest with the rest
|
|
|
|
of the pattern. */
|
|
|
|
&& (FCT (p, rs, string_end,
|
|
|
|
rs == string
|
|
|
|
? no_leading_period
|
|
|
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
|
|
|
flags & FNM_FILE_NAME
|
2010-08-10 04:09:37 +00:00
|
|
|
? flags : flags & ~FNM_PERIOD, NULL, alloca_used) == 0
|
2001-03-15 09:36:19 +00:00
|
|
|
/* This didn't work. Try the whole pattern. */
|
|
|
|
|| (rs != string
|
|
|
|
&& FCT (pattern - 1, rs, string_end,
|
|
|
|
rs == string
|
|
|
|
? no_leading_period
|
|
|
|
: (rs[-1] == '/' && NO_LEADING_PERIOD (flags)
|
|
|
|
? 1 : 0),
|
|
|
|
flags & FNM_FILE_NAME
|
2010-08-10 04:09:37 +00:00
|
|
|
? flags : flags & ~FNM_PERIOD, NULL,
|
|
|
|
alloca_used) == 0)))
|
2001-03-15 09:36:19 +00:00
|
|
|
/* It worked. Signal success. */
|
2010-08-10 04:09:37 +00:00
|
|
|
goto success;
|
2001-03-15 09:36:19 +00:00
|
|
|
}
|
|
|
|
while ((list = list->next) != NULL);
|
|
|
|
|
|
|
|
/* None of the patterns lead to a match. */
|
2010-08-10 04:09:37 +00:00
|
|
|
retval = FNM_NOMATCH;
|
|
|
|
break;
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
case L('?'):
|
2010-08-10 04:09:37 +00:00
|
|
|
if (FCT (p, string, string_end, no_leading_period, flags, NULL,
|
|
|
|
alloca_used) == 0)
|
|
|
|
goto success;
|
2001-03-15 09:36:19 +00:00
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
|
|
|
case L('@'):
|
|
|
|
do
|
2001-03-15 20:04:25 +00:00
|
|
|
/* I cannot believe it but `strcat' is actually acceptable
|
|
|
|
here. Match the entire string with the prefix from the
|
|
|
|
pattern list and the rest of the pattern following the
|
|
|
|
pattern list. */
|
|
|
|
if (FCT (STRCAT (list->str, p), string, string_end,
|
|
|
|
no_leading_period,
|
2007-04-01 19:44:33 +00:00
|
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
2010-08-10 04:09:37 +00:00
|
|
|
NULL, alloca_used) == 0)
|
2001-03-15 20:04:25 +00:00
|
|
|
/* It worked. Signal success. */
|
2010-08-10 04:09:37 +00:00
|
|
|
goto success;
|
2001-03-15 09:36:19 +00:00
|
|
|
while ((list = list->next) != NULL);
|
|
|
|
|
|
|
|
/* None of the patterns lead to a match. */
|
2010-08-10 04:09:37 +00:00
|
|
|
retval = FNM_NOMATCH;
|
|
|
|
break;
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
case L('!'):
|
|
|
|
for (rs = string; rs <= string_end; ++rs)
|
|
|
|
{
|
|
|
|
struct patternlist *runp;
|
|
|
|
|
|
|
|
for (runp = list; runp != NULL; runp = runp->next)
|
|
|
|
if (FCT (runp->str, string, rs, no_leading_period,
|
2007-04-01 19:44:33 +00:00
|
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
2010-08-10 04:09:37 +00:00
|
|
|
NULL, alloca_used) == 0)
|
2001-03-15 09:36:19 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* If none of the patterns matched see whether the rest does. */
|
|
|
|
if (runp == NULL
|
|
|
|
&& (FCT (p, rs, string_end,
|
|
|
|
rs == string
|
|
|
|
? no_leading_period
|
|
|
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
2007-04-01 19:44:33 +00:00
|
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
2010-08-10 04:09:37 +00:00
|
|
|
NULL, alloca_used) == 0))
|
2001-03-15 09:36:19 +00:00
|
|
|
/* This is successful. */
|
2010-08-10 04:09:37 +00:00
|
|
|
goto success;
|
2001-03-15 09:36:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* None of the patterns together with the rest of the pattern
|
|
|
|
lead to a match. */
|
2010-08-10 04:09:37 +00:00
|
|
|
retval = FNM_NOMATCH;
|
|
|
|
break;
|
2001-03-15 09:36:19 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
assert (! "Invalid extended matching operator");
|
2010-08-10 04:09:37 +00:00
|
|
|
retval = -1;
|
2001-03-15 09:36:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-08-10 04:09:37 +00:00
|
|
|
success:
|
|
|
|
out:
|
|
|
|
if (any_malloced)
|
|
|
|
while (list != NULL)
|
|
|
|
{
|
|
|
|
struct patternlist *old = list;
|
|
|
|
list = list->next;
|
|
|
|
if (old->malloced)
|
|
|
|
free (old);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
2001-03-15 09:36:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-01-18 01:46:57 +00:00
|
|
|
#undef FOLD
|
|
|
|
#undef CHAR
|
|
|
|
#undef UCHAR
|
2001-03-15 09:36:19 +00:00
|
|
|
#undef INT
|
2000-01-18 01:46:57 +00:00
|
|
|
#undef FCT
|
2001-03-15 09:36:19 +00:00
|
|
|
#undef EXT
|
|
|
|
#undef END
|
2007-04-01 19:44:33 +00:00
|
|
|
#undef STRUCT
|
2001-03-15 09:36:19 +00:00
|
|
|
#undef MEMPCPY
|
|
|
|
#undef MEMCHR
|
2000-01-26 03:22:20 +00:00
|
|
|
#undef STRCOLL
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
#undef STRLEN
|
|
|
|
#undef STRCAT
|
2000-01-18 01:46:57 +00:00
|
|
|
#undef L
|
2000-01-19 02:23:18 +00:00
|
|
|
#undef BTOWC
|
2014-06-26 15:10:46 +00:00
|
|
|
#undef WIDE_CHAR_VERSION
|
2014-09-11 23:02:17 +00:00
|
|
|
#undef FINDIDX
|