2000-01-18 01:46:57 +00:00
|
|
|
/* Copyright (C) 1991-1993, 1996-1999, 2000 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public License as
|
|
|
|
published by the Free Software Foundation; either version 2 of the
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this library; see the file COPYING.LIB. If not,
|
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
/* Match STRING against the filename pattern PATTERN, returning zero if
|
|
|
|
it matches, nonzero if not. */
|
|
|
|
static int FCT (const CHAR *pattern, const CHAR *string,
|
|
|
|
int no_leading_period, int flags) internal_function;
|
|
|
|
|
|
|
|
static int
|
|
|
|
internal_function
|
|
|
|
FCT (pattern, string, no_leading_period, flags)
|
|
|
|
const CHAR *pattern;
|
|
|
|
const CHAR *string;
|
|
|
|
int no_leading_period;
|
|
|
|
int flags;
|
|
|
|
{
|
|
|
|
register const CHAR *p = pattern, *n = string;
|
|
|
|
register UCHAR c;
|
2000-05-24 20:22:51 +00:00
|
|
|
#ifdef _LIBC
|
|
|
|
const UCHAR *collseq = (const UCHAR *)
|
|
|
|
_NL_CURRENT(LC_COLLATE, CONCAT(_NL_COLLATE_COLLSEQ,SUFFIX));
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
const wint_t *names = (const wint_t *)
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_NAMES);
|
|
|
|
size_t size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_SIZE);
|
|
|
|
size_t layers = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_LAYERS);
|
|
|
|
# endif
|
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
|
|
|
|
while ((c = *p++) != L('\0'))
|
|
|
|
{
|
|
|
|
c = FOLD (c);
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case L('?'):
|
|
|
|
if (*n == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
else if (*n == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
else if (*n == L('.') && no_leading_period
|
|
|
|
&& (n == string
|
|
|
|
|| (n[-1] == L('/') && (flags & FNM_FILE_NAME))))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L('\\'):
|
|
|
|
if (!(flags & FNM_NOESCAPE))
|
|
|
|
{
|
|
|
|
c = *p++;
|
|
|
|
if (c == L('\0'))
|
|
|
|
/* Trailing \ loses. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
c = FOLD (c);
|
|
|
|
}
|
|
|
|
if (FOLD ((UCHAR) *n) != c)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L('*'):
|
|
|
|
if (*n == L('.') && no_leading_period
|
|
|
|
&& (n == string
|
|
|
|
|| (n[-1] == L('/') && (flags & FNM_FILE_NAME))))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
for (c = *p++; c == L('?') || c == L('*'); c = *p++)
|
|
|
|
{
|
|
|
|
if (*n == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
/* A slash does not match a wildcard under FNM_FILE_NAME. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
else if (c == L('?'))
|
|
|
|
{
|
|
|
|
/* A ? needs to match one character. */
|
|
|
|
if (*n == L('\0'))
|
|
|
|
/* There isn't another character; no match. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
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-01-26 03:46:22 +00:00
|
|
|
this does mean it cannot match. If the FNM_LEADING_DIR
|
|
|
|
flag is set and exactly one slash is following, we have
|
|
|
|
a match. */
|
|
|
|
{
|
|
|
|
int result = (flags & FNM_FILE_NAME) == 0 ? 0 : FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (flags & FNM_FILE_NAME)
|
|
|
|
{
|
|
|
|
const CHAR *slashp = STRCHR (n, L('/'));
|
|
|
|
|
|
|
|
if (flags & FNM_LEADING_DIR)
|
|
|
|
{
|
|
|
|
if (slashp != NULL
|
|
|
|
&& STRCHR (slashp + 1, L('/')) == NULL)
|
|
|
|
result = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (slashp == NULL)
|
|
|
|
result = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
const CHAR *endp;
|
|
|
|
|
|
|
|
endp = STRCHRNUL (n, (flags & FNM_FILE_NAME) ? L('/') : L('\0'));
|
|
|
|
|
|
|
|
if (c == L('['))
|
|
|
|
{
|
|
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
|
|
|
|
|
|
for (--p; n < endp; ++n)
|
|
|
|
if (FCT (p, n, (no_leading_period
|
|
|
|
&& (n == string
|
|
|
|
|| (n[-1] == L('/')
|
|
|
|
&& (flags & FNM_FILE_NAME)))),
|
|
|
|
flags2) == 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (c == L('/') && (flags & FNM_FILE_NAME))
|
|
|
|
{
|
|
|
|
while (*n != L('\0') && *n != L('/'))
|
|
|
|
++n;
|
|
|
|
if (*n == L('/')
|
|
|
|
&& (FCT (p, n + 1, flags & FNM_PERIOD, flags) == 0))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
|
|
|
|
|
|
if (c == L('\\') && !(flags & FNM_NOESCAPE))
|
|
|
|
c = *p;
|
|
|
|
c = FOLD (c);
|
|
|
|
for (--p; n < endp; ++n)
|
|
|
|
if (FOLD ((UCHAR) *n) == c
|
|
|
|
&& (FCT (p, n, (no_leading_period
|
|
|
|
&& (n == string
|
|
|
|
|| (n[-1] == L('/')
|
|
|
|
&& (flags & FNM_FILE_NAME)))),
|
|
|
|
flags2) == 0))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we come here no match is possible with the wildcard. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
case L('['):
|
|
|
|
{
|
|
|
|
static int posixly_correct;
|
2000-07-04 08:22:44 +00:00
|
|
|
/* Nonzero if the sense of the character class is inverted. */
|
2000-01-18 01:46:57 +00:00
|
|
|
register int not;
|
|
|
|
CHAR cold;
|
|
|
|
|
|
|
|
if (posixly_correct == 0)
|
|
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
|
|
|
|
if (*n == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (*n == L('.') && no_leading_period
|
|
|
|
&& (n == string
|
|
|
|
|| (n[-1] == L('/') && (flags & FNM_FILE_NAME))))
|
|
|
|
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;
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
UCHAR fn = FOLD ((UCHAR) *n);
|
|
|
|
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == L('\\'))
|
|
|
|
{
|
|
|
|
if (*p == L('\0'))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
c = FOLD ((UCHAR) *p);
|
|
|
|
++p;
|
|
|
|
|
|
|
|
if (c == fn)
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
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. */
|
|
|
|
if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE) != 0)
|
2000-07-04 21:32:15 +00:00
|
|
|
{
|
2000-08-02 00:09:25 +00:00
|
|
|
/* Old locale format. */
|
|
|
|
# if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
|
|
if ((wt & 0xf0ffff) == 0)
|
|
|
|
{
|
|
|
|
wt >>= 16;
|
|
|
|
if ((__ctype_b[(UCHAR) *n] & wt) != 0)
|
|
|
|
goto matched;
|
|
|
|
}
|
2000-07-04 21:32:15 +00:00
|
|
|
# else
|
2000-08-02 00:09:25 +00:00
|
|
|
if (wt <= 0x800)
|
|
|
|
{
|
|
|
|
if ((__ctype_b[(UCHAR) *n] & wt) != 0)
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
else
|
|
|
|
if (ISWCTYPE (BTOWC ((UCHAR) *n), wt))
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
else
|
2000-07-04 21:32:15 +00:00
|
|
|
{
|
2000-08-02 00:09:25 +00:00
|
|
|
/* New locale format. */
|
|
|
|
if (_ISCTYPE ((UCHAR) *n, wt))
|
2000-07-04 21:32:15 +00:00
|
|
|
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('='))
|
|
|
|
{
|
|
|
|
UCHAR str[1];
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
str[0] = c;
|
|
|
|
|
|
|
|
c = *++p;
|
|
|
|
if (c != L('=') || p[1] != L(']'))
|
|
|
|
{
|
|
|
|
p = startp;
|
|
|
|
c = L('[');
|
|
|
|
goto normal_bracket;
|
|
|
|
}
|
|
|
|
p += 2;
|
|
|
|
|
|
|
|
if (nrules == 0)
|
|
|
|
{
|
|
|
|
if ((UCHAR) *n == str[0])
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const int32_t *table;
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
const int32_t *weights;
|
|
|
|
const int32_t *extra;
|
|
|
|
# else
|
|
|
|
const unsigned char *weights;
|
|
|
|
const unsigned char *extra;
|
|
|
|
# endif
|
|
|
|
const int32_t *indirect;
|
|
|
|
int32_t idx;
|
|
|
|
const UCHAR *cp = (const UCHAR *) str;
|
|
|
|
|
|
|
|
/* This #include defines a local function! */
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
# include <locale/weightwc.h>
|
|
|
|
# else
|
|
|
|
# include <locale/weight.h>
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# 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);
|
|
|
|
extra = (const int32_t *)
|
|
|
|
_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
|
|
|
|
|
|
|
|
idx = findidx (&cp);
|
|
|
|
if (idx != 0)
|
|
|
|
{
|
|
|
|
/* We found a table entry. Now see whether the
|
|
|
|
character we are currently at has the same
|
|
|
|
equivalance class value. */
|
2000-07-05 13:22:48 +00:00
|
|
|
# if !WIDE_CHAR_VERSION
|
2000-07-04 23:27:39 +00:00
|
|
|
int len = weights[idx];
|
2000-07-05 13:22:48 +00:00
|
|
|
# endif
|
2000-07-04 23:27:39 +00:00
|
|
|
int32_t idx2;
|
|
|
|
const UCHAR *np = (const UCHAR *) n;
|
|
|
|
|
|
|
|
idx2 = findidx (&np);
|
2000-07-05 22:02:03 +00:00
|
|
|
# if WIDE_CHAR_VERSION
|
|
|
|
if (idx2 != 0 && weights[idx] == weights[idx2])
|
|
|
|
goto matched;
|
|
|
|
# else
|
2000-07-04 23:27:39 +00:00
|
|
|
if (idx2 != 0 && len == weights[idx2])
|
|
|
|
{
|
|
|
|
int cnt = 0;
|
|
|
|
|
|
|
|
while (cnt < len
|
|
|
|
&& (weights[idx + 1 + cnt]
|
|
|
|
== weights[idx2 + 1 + cnt]))
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
if (cnt == len)
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
#endif
|
2000-01-18 01:46:57 +00:00
|
|
|
else if (c == L('\0'))
|
|
|
|
/* [ (unterminated) loses. */
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
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;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
char str[c1];
|
|
|
|
int strcnt;
|
|
|
|
# else
|
|
|
|
# define str (startp + 1)
|
|
|
|
# endif
|
|
|
|
const unsigned char *extra;
|
|
|
|
int32_t idx;
|
|
|
|
int32_t elem;
|
|
|
|
int32_t second;
|
|
|
|
int32_t hash;
|
|
|
|
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
/* We have to convert the name to a single-byte
|
|
|
|
string. This is possible since the names
|
|
|
|
consist of ASCII characters and the internal
|
|
|
|
representation is UCS4. */
|
|
|
|
for (strcnt = 0; strcnt < c1; ++strcnt)
|
|
|
|
str[strcnt] = startp[1 + strcnt];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
/* Locate the character in the hashing table. */
|
|
|
|
hash = elem_hash (str, c1);
|
|
|
|
|
|
|
|
idx = 0;
|
|
|
|
elem = hash % table_size;
|
|
|
|
second = hash % (table_size - 2);
|
|
|
|
while (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
/* First compare the hashing value. */
|
|
|
|
if (symb_table[2 * elem] == hash
|
|
|
|
&& c1 == extra[symb_table[2 * elem + 1]]
|
|
|
|
&& memcmp (str,
|
|
|
|
&extra[symb_table[2 * elem + 1]
|
|
|
|
+ 1], c1) == 0)
|
|
|
|
{
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next entry. */
|
|
|
|
elem += second;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
/* Compare the byte sequence but only if
|
|
|
|
this is not part of a range. */
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
int32_t *wextra;
|
|
|
|
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~4;
|
|
|
|
|
|
|
|
wextra = (int32_t *) &extra[idx + 4];
|
|
|
|
# endif
|
|
|
|
|
|
|
|
if (! is_range)
|
|
|
|
{
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
for (c1 = 0; c1 < wextra[idx]; ++c1)
|
|
|
|
if (n[c1] != wextra[1 + c1])
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (c1 == wextra[idx])
|
|
|
|
goto matched;
|
|
|
|
# else
|
|
|
|
for (c1 = 0; c1 < extra[idx]; ++c1)
|
|
|
|
if (n[c1] != extra[1 + c1])
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (c1 == extra[idx])
|
|
|
|
goto matched;
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the collation sequence value. */
|
|
|
|
is_seqval = 1;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
cold = wextra[1 + wextra[idx]];
|
|
|
|
# else
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
idx = (idx + 3) & ~4;
|
|
|
|
cold = *((int32_t *) &extra[idx]);
|
|
|
|
# endif
|
|
|
|
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else if (symb_table[2 * elem] != 0 && c1 == 1)
|
|
|
|
{
|
|
|
|
/* No valid character. Match it as a
|
|
|
|
single byte. */
|
|
|
|
if (!is_range && *n == str[0])
|
|
|
|
goto matched;
|
|
|
|
|
|
|
|
cold = str[0];
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
# undef str
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
c = FOLD (c);
|
|
|
|
normal_bracket:
|
|
|
|
|
|
|
|
/* 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 (!is_range && c == fn)
|
|
|
|
goto matched;
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
/* Search in the `names' array for the characters. */
|
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
|
|
|
if (size != 0)
|
2000-01-26 02:20:01 +00:00
|
|
|
{
|
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
|
|
|
/* Old locale format. */
|
|
|
|
int idx;
|
|
|
|
size_t cnt;
|
|
|
|
|
|
|
|
idx = fn % size;
|
|
|
|
cnt = 0;
|
|
|
|
while (names[idx] != fn)
|
|
|
|
{
|
|
|
|
if (++cnt == layers)
|
|
|
|
/* XXX We don't know anything about
|
|
|
|
the character we are supposed to
|
|
|
|
match. This means we are failing. */
|
|
|
|
goto range_not_matched;
|
|
|
|
|
|
|
|
idx += size;
|
|
|
|
}
|
|
|
|
fcollseq = collseq[idx];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* New locale format. */
|
|
|
|
fcollseq =
|
|
|
|
collseq_table_lookup ((const char *) collseq, fn);
|
|
|
|
if (fcollseq == ~((uint32_t) 0))
|
2000-05-24 20:22:51 +00:00
|
|
|
/* 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
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
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
|
|
|
if (size != 0)
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
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
|
|
|
/* Old locale format. */
|
|
|
|
int idx;
|
|
|
|
size_t cnt;
|
|
|
|
|
|
|
|
idx = cold % size;
|
|
|
|
cnt = 0;
|
|
|
|
while (names[idx] != cold)
|
2000-07-05 22:02:03 +00:00
|
|
|
{
|
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
|
|
|
if (++cnt == layers)
|
|
|
|
{
|
|
|
|
idx = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
idx += size;
|
2000-07-05 22:02:03 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
lcollseq =
|
|
|
|
idx == -1 ? 0xffffffff : collseq[idx];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* New locale format. */
|
|
|
|
lcollseq =
|
|
|
|
collseq_table_lookup ((const char *) 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;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
char str[c1];
|
|
|
|
int strcnt;
|
|
|
|
# else
|
|
|
|
# define str (startp + 1)
|
2000-05-24 20:22:51 +00:00
|
|
|
# endif
|
2000-07-05 22:02:03 +00:00
|
|
|
const unsigned char *extra;
|
|
|
|
int32_t idx;
|
|
|
|
int32_t elem;
|
|
|
|
int32_t second;
|
|
|
|
int32_t hash;
|
|
|
|
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
/* We have to convert the name to a single-byte
|
|
|
|
string. This is possible since the names
|
|
|
|
consist of ASCII characters and the internal
|
|
|
|
representation is UCS4. */
|
|
|
|
for (strcnt = 0; strcnt < c1; ++strcnt)
|
|
|
|
str[strcnt] = startp[1 + strcnt];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
/* Locate the character in the hashing
|
|
|
|
table. */
|
|
|
|
hash = elem_hash (str, c1);
|
|
|
|
|
|
|
|
idx = 0;
|
|
|
|
elem = hash % table_size;
|
|
|
|
second = hash % (table_size - 2);
|
|
|
|
while (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
/* First compare the hashing value. */
|
|
|
|
if (symb_table[2 * elem] == hash
|
|
|
|
&& (c1
|
|
|
|
== extra[symb_table[2 * elem + 1]])
|
|
|
|
&& memcmp (str,
|
|
|
|
&extra[symb_table[2 * elem + 1]
|
|
|
|
+ 1], c1) == 0)
|
|
|
|
{
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next entry. */
|
|
|
|
elem += second;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
{
|
|
|
|
/* Compare the byte sequence but only if
|
|
|
|
this is not part of a range. */
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
int32_t *wextra;
|
|
|
|
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx = (idx + 3) & ~4;
|
|
|
|
|
|
|
|
wextra = (int32_t *) &extra[idx + 4];
|
|
|
|
# endif
|
|
|
|
/* Get the collation sequence value. */
|
|
|
|
is_seqval = 1;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
cend = wextra[1 + wextra[idx]];
|
|
|
|
# else
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
idx = (idx + 3) & ~4;
|
|
|
|
cend = *((int32_t *) &extra[idx]);
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
else if (symb_table[2 * elem] != 0 && c1 == 1)
|
|
|
|
{
|
|
|
|
cend = str[0];
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
# undef str
|
|
|
|
}
|
|
|
|
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 (
|
|
|
|
# ifdef 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
|
|
|
{
|
2000-07-05 22:02:03 +00:00
|
|
|
# ifdef WIDE_CHAR_VERSION
|
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
|
|
|
if (size != 0)
|
2000-05-24 20:22:51 +00:00
|
|
|
{
|
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
|
|
|
/* Old locale format. */
|
|
|
|
int idx;
|
|
|
|
size_t cnt;
|
|
|
|
|
|
|
|
idx = cend % size;
|
|
|
|
cnt = 0;
|
|
|
|
while (names[idx] != cend)
|
|
|
|
{
|
|
|
|
if (++cnt == layers)
|
|
|
|
{
|
|
|
|
/* Hum, no information about the
|
|
|
|
upper bound. The matching
|
|
|
|
succeeds if the lower bound is
|
|
|
|
matched exactly. */
|
|
|
|
if (lcollseq != fcollseq)
|
|
|
|
goto range_not_matched;
|
|
|
|
|
|
|
|
goto matched;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
hcollseq = collseq[idx];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* New locale format. */
|
|
|
|
hcollseq =
|
|
|
|
collseq_table_lookup ((const char *) collseq, cend);
|
|
|
|
if (hcollseq == ~((uint32_t) 0))
|
2000-07-05 22:02:03 +00:00
|
|
|
{
|
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
|
|
|
/* Hum, no information about the
|
|
|
|
upper bound. The matching succeeds
|
|
|
|
if the lower bound is matched
|
|
|
|
exactly. */
|
|
|
|
if (lcollseq != fcollseq)
|
2000-07-05 22:02:03 +00:00
|
|
|
goto range_not_matched;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
2000-05-24 20:22:51 +00:00
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
|
|
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. */
|
2000-07-26 16:04:48 +00:00
|
|
|
if (cold <= fn && fn <= c)
|
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. */
|
2000-07-04 08:22:44 +00:00
|
|
|
do
|
2000-01-18 01:46:57 +00:00
|
|
|
{
|
2000-07-05 22:02:03 +00:00
|
|
|
ignore_next:
|
2000-07-04 08:22:44 +00:00
|
|
|
c = *p++;
|
|
|
|
|
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'))
|
|
|
|
{
|
|
|
|
p = startp;
|
|
|
|
goto ignore_next;
|
|
|
|
}
|
|
|
|
}
|
2000-01-18 01:46:57 +00:00
|
|
|
p += 2;
|
2000-07-05 22:02:03 +00:00
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
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;
|
|
|
|
c = *p++;
|
|
|
|
}
|
|
|
|
else if (c == L('[') && *p == L('.'))
|
|
|
|
{
|
|
|
|
++p;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = *++p;
|
|
|
|
if (c == '\0')
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
|
|
|
|
if (*p == L('.') && p[1] == L(']'))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p += 2;
|
|
|
|
c = *p++;
|
2000-01-18 01:46:57 +00:00
|
|
|
}
|
|
|
|
}
|
2000-07-04 08:22:44 +00:00
|
|
|
while (c != L(']'));
|
2000-01-18 01:46:57 +00:00
|
|
|
if (not)
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if (c != FOLD ((UCHAR) *n))
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
++n;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*n == '\0')
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((flags & FNM_LEADING_DIR) && *n == L('/'))
|
|
|
|
/* 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
|
|
|
|
|
|
|
#undef FOLD
|
|
|
|
#undef CHAR
|
|
|
|
#undef UCHAR
|
|
|
|
#undef FCT
|
|
|
|
#undef STRCHR
|
|
|
|
#undef STRCHRNUL
|
2000-01-26 03:22:20 +00:00
|
|
|
#undef STRCOLL
|
2000-01-18 01:46:57 +00:00
|
|
|
#undef L
|
2000-01-19 02:23:18 +00:00
|
|
|
#undef BTOWC
|
2000-05-24 20:22:51 +00:00
|
|
|
#undef SUFFIX
|