mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
4c7d276eb1
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.
345 lines
10 KiB
C
345 lines
10 KiB
C
/* 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. */
|
|
|
|
#if HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
/* Enable GNU extensions in fnmatch.h. */
|
|
#ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <fnmatch.h>
|
|
#include <ctype.h>
|
|
|
|
#if HAVE_STRING_H || defined _LIBC
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#endif
|
|
|
|
/* For platform which support the ISO C amendement 1 functionality we
|
|
support user defined character classes. */
|
|
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
|
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
|
|
# include <wchar.h>
|
|
# include <wctype.h>
|
|
#endif
|
|
|
|
/* We need some of the locale data (the collation sequence information)
|
|
but there is no interface to get this information in general. Therefore
|
|
we support a correct implementation only in glibc. */
|
|
#ifdef _LIBC
|
|
# include "../locale/localeinfo.h"
|
|
# include "../locale/elem-hash.h"
|
|
# include "../locale/coll-lookup.h"
|
|
|
|
# define CONCAT(a,b) __CONCAT(a,b)
|
|
# define mbsinit __mbsinit
|
|
# define mbsrtowcs __mbsrtowcs
|
|
#endif
|
|
|
|
/* Comment out all this code if we are using the GNU C Library, and are not
|
|
actually compiling the library itself. This code is part of the GNU C
|
|
Library, but also included in many other GNU distributions. Compiling
|
|
and linking in this code is a waste when using the GNU C library
|
|
(especially if it is a shared library). Rather than having every GNU
|
|
program understand `configure --with-gnu-libc' and omit the object files,
|
|
it is simpler to just do this in the source for each such file. */
|
|
|
|
#if defined _LIBC || !defined __GNU_LIBRARY__
|
|
|
|
|
|
# if defined STDC_HEADERS || !defined isascii
|
|
# define ISASCII(c) 1
|
|
# else
|
|
# define ISASCII(c) isascii(c)
|
|
# endif
|
|
|
|
# ifdef isblank
|
|
# define ISBLANK(c) (ISASCII (c) && isblank (c))
|
|
# else
|
|
# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
|
|
# endif
|
|
# ifdef isgraph
|
|
# define ISGRAPH(c) (ISASCII (c) && isgraph (c))
|
|
# else
|
|
# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
|
|
# endif
|
|
|
|
# define ISPRINT(c) (ISASCII (c) && isprint (c))
|
|
# define ISDIGIT(c) (ISASCII (c) && isdigit (c))
|
|
# define ISALNUM(c) (ISASCII (c) && isalnum (c))
|
|
# define ISALPHA(c) (ISASCII (c) && isalpha (c))
|
|
# define ISCNTRL(c) (ISASCII (c) && iscntrl (c))
|
|
# define ISLOWER(c) (ISASCII (c) && islower (c))
|
|
# define ISPUNCT(c) (ISASCII (c) && ispunct (c))
|
|
# define ISSPACE(c) (ISASCII (c) && isspace (c))
|
|
# define ISUPPER(c) (ISASCII (c) && isupper (c))
|
|
# define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
|
|
|
|
# define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
|
|
|
|
# if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
|
/* The GNU C library provides support for user-defined character classes
|
|
and the functions from ISO C amendement 1. */
|
|
# ifdef CHARCLASS_NAME_MAX
|
|
# define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
|
|
# else
|
|
/* This shouldn't happen but some implementation might still have this
|
|
problem. Use a reasonable default value. */
|
|
# define CHAR_CLASS_MAX_LENGTH 256
|
|
# endif
|
|
|
|
# ifdef _LIBC
|
|
# define IS_CHAR_CLASS(string) __wctype (string)
|
|
# else
|
|
# define IS_CHAR_CLASS(string) wctype (string)
|
|
# endif
|
|
|
|
# ifdef _LIBC
|
|
# define ISWCTYPE(WC, WT) __iswctype (WC, WT)
|
|
# else
|
|
# define ISWCTYPE(WC, WT) iswctype (WC, WT)
|
|
# endif
|
|
|
|
# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || _LIBC
|
|
/* In this case we are implementing the multibyte character handling. */
|
|
# define HANDLE_MULTIBYTE 1
|
|
# endif
|
|
|
|
# else
|
|
# define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */
|
|
|
|
# define IS_CHAR_CLASS(string) \
|
|
(STREQ (string, "alpha") || STREQ (string, "upper") \
|
|
|| STREQ (string, "lower") || STREQ (string, "digit") \
|
|
|| STREQ (string, "alnum") || STREQ (string, "xdigit") \
|
|
|| STREQ (string, "space") || STREQ (string, "print") \
|
|
|| STREQ (string, "punct") || STREQ (string, "graph") \
|
|
|| STREQ (string, "cntrl") || STREQ (string, "blank"))
|
|
# endif
|
|
|
|
/* Avoid depending on library functions or files
|
|
whose names are inconsistent. */
|
|
|
|
# if !defined _LIBC && !defined getenv
|
|
extern char *getenv ();
|
|
# endif
|
|
|
|
# ifndef errno
|
|
extern int errno;
|
|
# endif
|
|
|
|
/* This function doesn't exist on most systems. */
|
|
|
|
# if !defined HAVE___STRCHRNUL && !defined _LIBC
|
|
static char *
|
|
__strchrnul (s, c)
|
|
const char *s;
|
|
int c;
|
|
{
|
|
char *result = strchr (s, c);
|
|
if (result == NULL)
|
|
result = strchr (s, '\0');
|
|
return result;
|
|
}
|
|
# endif
|
|
|
|
# if HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC
|
|
static wchar_t *
|
|
__wcschrnul (s, c)
|
|
const wchar_t *s;
|
|
wint_t c;
|
|
{
|
|
wchar_t *result = wcschr (s, c);
|
|
if (result == NULL)
|
|
result = wcschr (s, '\0');
|
|
return result;
|
|
}
|
|
# endif
|
|
|
|
# ifndef internal_function
|
|
/* Inside GNU libc we mark some function in a special way. In other
|
|
environments simply ignore the marking. */
|
|
# define internal_function
|
|
# endif
|
|
|
|
/* Note that this evaluates C many times. */
|
|
# ifdef _LIBC
|
|
# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))
|
|
# else
|
|
# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c))
|
|
# endif
|
|
# define CHAR char
|
|
# define UCHAR unsigned char
|
|
# define FCT internal_fnmatch
|
|
# define L(CS) CS
|
|
# ifdef _LIBC
|
|
# define BTOWC(C) __btowc (C)
|
|
# else
|
|
# define BTOWC(C) btowc (C)
|
|
# endif
|
|
# define STRCHR(S, C) strchr (S, C)
|
|
# define STRCHRNUL(S, C) __strchrnul (S, C)
|
|
# define STRCOLL(S1, S2) strcoll (S1, S2)
|
|
# include "fnmatch_loop.c"
|
|
|
|
|
|
# if HANDLE_MULTIBYTE
|
|
/* Note that this evaluates C many times. */
|
|
# ifdef _LIBC
|
|
# define FOLD(c) ((flags & FNM_CASEFOLD) ? towlower (c) : (c))
|
|
# else
|
|
# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? towlower (c) : (c))
|
|
# endif
|
|
# define CHAR wchar_t
|
|
# define UCHAR wint_t
|
|
# define FCT internal_fnwmatch
|
|
# define L(CS) L##CS
|
|
# define BTOWC(C) (C)
|
|
# define STRCHR(S, C) wcschr (S, C)
|
|
# define STRCHRNUL(S, C) __wcschrnul (S, C)
|
|
# define STRCOLL(S1, S2) wcscoll (S1, S2)
|
|
# define WIDE_CHAR_VERSION 1
|
|
|
|
# undef IS_CHAR_CLASS
|
|
/* We have to convert the wide character string in a multibyte string. But
|
|
we know that the character class names consist of alphanumeric characters
|
|
from the portable character set, and since the wide character encoding
|
|
for a member of the portable character set is the same code point as
|
|
its single-byte encoding, we can use a simplified method to convert the
|
|
string to a multibyte character string. */
|
|
static wctype_t
|
|
is_char_class (const wchar_t *wcs)
|
|
{
|
|
char s[CHAR_CLASS_MAX_LENGTH + 1];
|
|
char *cp = s;
|
|
|
|
do
|
|
{
|
|
/* Test for a printable character from the portable character set. */
|
|
# ifdef _LIBC
|
|
if (*wcs < 0x20 || *wcs > 0x7e
|
|
|| *wcs == 0x24 || *wcs == 0x40 || *wcs == 0x60)
|
|
return (wctype_t) 0;
|
|
# else
|
|
switch (*wcs)
|
|
{
|
|
case L' ': case L'!': case L'"': case L'#': case L'%':
|
|
case L'&': case L'\'': case L'(': case L')': case L'*':
|
|
case L'+': case L',': case L'-': case L'.': case L'/':
|
|
case L'0': case L'1': case L'2': case L'3': case L'4':
|
|
case L'5': case L'6': case L'7': case L'8': case L'9':
|
|
case L':': case L';': case L'<': case L'=': case L'>':
|
|
case L'?':
|
|
case L'A': case L'B': case L'C': case L'D': case L'E':
|
|
case L'F': case L'G': case L'H': case L'I': case L'J':
|
|
case L'K': case L'L': case L'M': case L'N': case L'O':
|
|
case L'P': case L'Q': case L'R': case L'S': case L'T':
|
|
case L'U': case L'V': case L'W': case L'X': case L'Y':
|
|
case L'Z':
|
|
case L'[': case L'\\': case L']': case L'^': case L'_':
|
|
case L'a': case L'b': case L'c': case L'd': case L'e':
|
|
case L'f': case L'g': case L'h': case L'i': case L'j':
|
|
case L'k': case L'l': case L'm': case L'n': case L'o':
|
|
case L'p': case L'q': case L'r': case L's': case L't':
|
|
case L'u': case L'v': case L'w': case L'x': case L'y':
|
|
case L'z': case L'{': case L'|': case L'}': case L'~':
|
|
break;
|
|
default:
|
|
return (wctype_t) 0;
|
|
}
|
|
# endif
|
|
|
|
/* Avoid overrunning the buffer. */
|
|
if (cp == s + CHAR_CLASS_MAX_LENGTH)
|
|
return (wctype_t) 0;
|
|
|
|
*cp++ = (char) *wcs++;
|
|
}
|
|
while (*wcs != L'\0');
|
|
|
|
*cp = '\0';
|
|
|
|
# ifdef _LIBC
|
|
return __wctype (s);
|
|
# else
|
|
return wctype (s);
|
|
# endif
|
|
}
|
|
# define IS_CHAR_CLASS(string) is_char_class (string)
|
|
|
|
# include "fnmatch_loop.c"
|
|
# endif
|
|
|
|
|
|
int
|
|
fnmatch (pattern, string, flags)
|
|
const char *pattern;
|
|
const char *string;
|
|
int flags;
|
|
{
|
|
# if HANDLE_MULTIBYTE
|
|
mbstate_t ps;
|
|
size_t n;
|
|
wchar_t *wpattern;
|
|
wchar_t *wstring;
|
|
|
|
if (MB_CUR_MAX == 1)
|
|
/* This is an optimization for 8-bit character set. */
|
|
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
|
|
|
|
/* Convert the strings into wide characters. */
|
|
memset (&ps, '\0', sizeof (ps));
|
|
n = mbsrtowcs (NULL, &pattern, 0, &ps);
|
|
if (n == (size_t) -1)
|
|
/* Something wrong.
|
|
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
|
already done? */
|
|
return -1;
|
|
wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
|
assert (mbsinit (&ps));
|
|
(void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
|
|
|
|
assert (mbsinit (&ps));
|
|
n = mbsrtowcs (NULL, &string, 0, &ps);
|
|
if (n == (size_t) -1)
|
|
/* Something wrong.
|
|
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
|
already done? */
|
|
return -1;
|
|
wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
|
assert (mbsinit (&ps));
|
|
(void) mbsrtowcs (wstring, &string, n + 1, &ps);
|
|
|
|
return internal_fnwmatch (wpattern, wstring, flags & FNM_PERIOD, flags);
|
|
# else
|
|
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
|
|
# endif /* mbstate_t and mbsrtowcs or _LIBC. */
|
|
}
|
|
|
|
#endif /* _LIBC or not __GNU_LIBRARY__. */
|