mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
118bad87bd
1998-12-31 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile: Use rpath $ORIGIN for modules which use any of the conversion libraries. * include/features.h: Mention latest extensions in _POSIX_C_SOURCE description. * libio/genops.c (list_all_lock): New variable. (_IO_un_link, _IO_link_in): Acquire lock before modifying _IO_list_all. [PR libc/911]. * sysdeps/i386/i686/strtok.s: Add missing cld. * sysdeps/i386/i686/mempcpy.S: New file. 1998-12-30 Geoff Keating <geoffk@ozemail.com.au> Suppress parentheses warnings: * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c (DL_FIND_ARG_COMPONENTS): here, * sysdeps/powerpc/dl-machine.c: here, * sysdeps/powerpc/fclrexcpt.c (feclearexcept): here, * sysdeps/powerpc/fesetround.c (fesetround): here, * sysdeps/powerpc/feupdateenv.c (feupdateenv): here, * sysdeps/powerpc/fraiseexcpt.c (feraiseexcept): here, * sysdeps/powerpc/fsetexcptflg.c (fesetexceptflag): here, * sysdeps/powerpc/s_rint.c (__rint): here, * sysdeps/powerpc/s_rintf.c (__rintf): here, * sysdeps/powerpc/w_sqrt.c (__sqrt): here, * sysdeps/powerpc/w_sqrtf.c (__sqrtf): and here. 1998-12-30 Geoff Keating <geoffk@ozemail.com.au> * wcsmbs/wcstold.c [__NO_LONG_DOUBLE_MATH]: Include wchar.h. * wcsmbs/wcstold_l.c [__NO_LONG_DOUBLE_MATH]: Likewise. Also define appropropriate prototypes, correct procedure names. 1998-12-30 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/generic/crypt-entry.c: Prototype __crypt_r, suppress warning. (__crypt_r): Add __restrict. * sysdeps/generic/crypt.h: Remove internal routine. Add __restrict. 1998-12-31 Ulrich Drepper <drepper@cygnus.com> * stdlib/longlong.h: Add missing #else in SPARC definitions. 1998-12-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> Patches by Ralf Baechle <ralf@gnu.org>: * sysdeps/unix/sysv/linux/mips/sgidefs.h: Removed. * sysdeps/unix/sysv/linux/mips/sys/asm.h: Removed. * sysdeps/unix/sysv/linux/mips/sys/regdef.h: Removed. * sysdeps/unix/sysv/linux/mips/sys/fpregdef.h: Removed. * sysdeps/unix/sysv/linux/mips/regdef.h: Removed. * sysdeps/unix/sysv/linux/mips/fpregdef.h: Removed. * sysdeps/unix/sysv/linux/mips/Makefile: Remove delete files. * sysdeps/unix/sysv/linux/mips/Dist: Remove deleted files. * sysdeps/mips/sys/fpregdef.h: New files, enhanced versions of deleted linux specific files. * sysdeps/mips/sys/asm.h: Likewise. * sysdeps/mips/sgidefs.h: Likewise. * sysdeps/mips/fpregdef.h: Likewise. * sysdeps/mips/regdef.h: Likewise. * sysdeps/mips/Makefile: Add new headers. * sysdeps/mips/Dist: Add new files. * sysdeps/mips/fpu_control.h (_FPU_DEFAULT): Change value. 1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * iconvdata/Makefile: Remove variable assignments and rules that are now auto-generated. Include $(objpfx)iconv-rules instead. Btw, that removes a few typos. (charmaps): New variable. ($(objpfx)iconv-rules): New target. (gen-8bit-modules): Renamed from sed-generated-headers, remove .h suffixes. (gen-8bit-gap-modules): Renamed from awk-generated-headers, remove .h suffixes. (gen-special-modules): New variable. (generated-modules): New variable. (headers): Use it. (before-compile): Likewise. (generated): Likewise, and add iconv-rules. * iconvdata/euc-cn.c: Renamed from euccn.c. * iconvdata/euc-jp.c: Renamed from eucjp.c. * iconvdata/euc-kr.c: Renamed from euckr.c. * iconvdata/euc-tw.c: Renamed from euctw.c. * iconvdata/iso_6937.c: Renamed from iso6937.c. * iconvdata/iso_6937-2.c: Renamed from iso6937-2.c. * iconvdata/t.61.c: Renamed from t61.c. * iconvdata/Makefile (distribute): Adjusted for those renames. Remove $(objpfx) from names. 1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sysdeps/generic/hp-timing.h: Fix comment. * sysdeps/generic/dl-hash.h: Likewise. * sysdeps/i386/i686/hp-timing.h: Likewise. 1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * posix/fnmatch.c (fnmatch): Always pass unsigned char values to FOLD macro. 1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * nss/db-Makefile ($(VAR_DB)/shadow.db): Fix last change. 1998-12-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Sync with current Linux 2.1.132 kernel sources. 1998-12-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> Patches by Ralf Baechle <ralf@gnu.org> for Linux/MIPS: * sysdeps/unix/sysv/linux/mips/syscalls.list: Add ipc, change pread/pwrite and llseek calls. * sysdeps/unix/sysv/linux/mips/sysdep.S: New file. 1998-12-29 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de> * malloc/thread-m.h [_LIBC] : Fix for NO_THREADS case.
387 lines
10 KiB
C
387 lines
10 KiB
C
/* Copyright (C) 1991, 92, 93, 96, 97, 98 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 <errno.h>
|
|
#include <fnmatch.h>
|
|
#include <ctype.h>
|
|
|
|
#if HAVE_STRING_H
|
|
# 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
|
|
|
|
/* 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
|
|
# 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
|
|
|
|
/* Match STRING against the filename pattern PATTERN, returning zero if
|
|
it matches, nonzero if not. */
|
|
int
|
|
fnmatch (pattern, string, flags)
|
|
const char *pattern;
|
|
const char *string;
|
|
int flags;
|
|
{
|
|
register const char *p = pattern, *n = string;
|
|
register unsigned char c;
|
|
|
|
/* 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
|
|
|
|
while ((c = *p++) != '\0')
|
|
{
|
|
c = FOLD (c);
|
|
|
|
switch (c)
|
|
{
|
|
case '?':
|
|
if (*n == '\0')
|
|
return FNM_NOMATCH;
|
|
else if ((flags & FNM_FILE_NAME) && *n == '/')
|
|
return FNM_NOMATCH;
|
|
else if ((flags & FNM_PERIOD) && *n == '.' &&
|
|
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
case '\\':
|
|
if (!(flags & FNM_NOESCAPE))
|
|
{
|
|
c = *p++;
|
|
if (c == '\0')
|
|
/* Trailing \ loses. */
|
|
return FNM_NOMATCH;
|
|
c = FOLD (c);
|
|
}
|
|
if (FOLD ((unsigned char) *n) != c)
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
case '*':
|
|
if ((flags & FNM_PERIOD) && *n == '.' &&
|
|
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
return FNM_NOMATCH;
|
|
|
|
for (c = *p++; c == '?' || c == '*'; c = *p++)
|
|
{
|
|
if ((flags & FNM_FILE_NAME) && *n == '/')
|
|
/* A slash does not match a wildcard under FNM_FILE_NAME. */
|
|
return FNM_NOMATCH;
|
|
else if (c == '?')
|
|
{
|
|
/* A ? needs to match one character. */
|
|
if (*n == '\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 == '\0')
|
|
return 0;
|
|
|
|
{
|
|
unsigned char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
|
|
c1 = FOLD (c1);
|
|
for (--p; *n != '\0'; ++n)
|
|
if ((c == '[' || FOLD ((unsigned char) *n) == c1) &&
|
|
fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
|
|
return 0;
|
|
return FNM_NOMATCH;
|
|
}
|
|
|
|
case '[':
|
|
{
|
|
/* Nonzero if the sense of the character class is inverted. */
|
|
static int posixly_correct;
|
|
register int not;
|
|
char cold;
|
|
|
|
if (posixly_correct == 0)
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
if (*n == '\0')
|
|
return FNM_NOMATCH;
|
|
|
|
if (*n == '.' && (flags & FNM_PERIOD) &&
|
|
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
return FNM_NOMATCH;
|
|
|
|
if (*n == '/' && (flags & FNM_FILE_NAME))
|
|
/* `/' cannot be matched. */
|
|
return FNM_NOMATCH;
|
|
|
|
not = (*p == '!' || (posixly_correct < 0 && *p == '^'));
|
|
if (not)
|
|
++p;
|
|
|
|
c = *p++;
|
|
for (;;)
|
|
{
|
|
unsigned int fn = FOLD (*n);
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == '\\')
|
|
{
|
|
if (*p == '\0')
|
|
return FNM_NOMATCH;
|
|
c = FOLD ((unsigned char) *p);
|
|
++p;
|
|
|
|
if (c == fn)
|
|
goto matched;
|
|
}
|
|
else if (c == '[' && *p == ':')
|
|
{
|
|
/* Leave room for the null. */
|
|
char str[CHAR_CLASS_MAX_LENGTH + 1];
|
|
size_t c1 = 0;
|
|
# if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
|
wctype_t wt;
|
|
# endif
|
|
|
|
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 == ':' && p[1] == ']')
|
|
{
|
|
p += 2;
|
|
break;
|
|
}
|
|
str[c1++] = 'c';
|
|
}
|
|
str[c1] = '\0';
|
|
|
|
# if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
|
wt = IS_CHAR_CLASS (str);
|
|
if (wt == 0)
|
|
/* Invalid character class name. */
|
|
return FNM_NOMATCH;
|
|
|
|
if (__iswctype (__btowc (*n), wt))
|
|
goto matched;
|
|
# else
|
|
if ((STREQ (str, "alnum") && ISALNUM (*n))
|
|
|| (STREQ (str, "alpha") && ISALPHA (*n))
|
|
|| (STREQ (str, "blank") && ISBLANK (*n))
|
|
|| (STREQ (str, "cntrl") && ISCNTRL (*n))
|
|
|| (STREQ (str, "digit") && ISDIGIT (*n))
|
|
|| (STREQ (str, "graph") && ISGRAPH (*n))
|
|
|| (STREQ (str, "lower") && ISLOWER (*n))
|
|
|| (STREQ (str, "print") && ISPRINT (*n))
|
|
|| (STREQ (str, "punct") && ISPUNCT (*n))
|
|
|| (STREQ (str, "space") && ISSPACE (*n))
|
|
|| (STREQ (str, "upper") && ISUPPER (*n))
|
|
|| (STREQ (str, "xdigit") && ISXDIGIT (*n)))
|
|
goto matched;
|
|
# endif
|
|
}
|
|
else if (c == '\0')
|
|
/* [ (unterminated) loses. */
|
|
return FNM_NOMATCH;
|
|
else if (FOLD (c) == fn)
|
|
goto matched;
|
|
|
|
cold = c;
|
|
c = *p++;
|
|
|
|
if (c == '-' && *p != ']')
|
|
{
|
|
/* It is a range. */
|
|
unsigned char cend = *p++;
|
|
if (!(flags & FNM_NOESCAPE) && cend == '\\')
|
|
cend = *p++;
|
|
if (cend == '\0')
|
|
return FNM_NOMATCH;
|
|
|
|
if (cold <= fn && fn <= FOLD (cend))
|
|
goto matched;
|
|
|
|
c = *p++;
|
|
}
|
|
if (c == ']')
|
|
break;
|
|
}
|
|
|
|
if (!not)
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
matched:
|
|
/* Skip the rest of the [...] that already matched. */
|
|
while (c != ']')
|
|
{
|
|
if (c == '\0')
|
|
/* [... (unterminated) loses. */
|
|
return FNM_NOMATCH;
|
|
|
|
c = *p++;
|
|
if (!(flags & FNM_NOESCAPE) && c == '\\')
|
|
{
|
|
if (*p == '\0')
|
|
return FNM_NOMATCH;
|
|
/* XXX 1003.2d11 is unclear if this is right. */
|
|
++p;
|
|
}
|
|
else if (c == '[' && *p == ':')
|
|
{
|
|
do
|
|
if (*++p == '\0')
|
|
return FNM_NOMATCH;
|
|
while (*p != ':' || p[1] == ']');
|
|
p += 2;
|
|
c = *p;
|
|
}
|
|
}
|
|
if (not)
|
|
return FNM_NOMATCH;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
if (c != FOLD ((unsigned char) *n))
|
|
return FNM_NOMATCH;
|
|
}
|
|
|
|
++n;
|
|
}
|
|
|
|
if (*n == '\0')
|
|
return 0;
|
|
|
|
if ((flags & FNM_LEADING_DIR) && *n == '/')
|
|
/* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */
|
|
return 0;
|
|
|
|
return FNM_NOMATCH;
|
|
|
|
# undef FOLD
|
|
}
|
|
|
|
#endif /* _LIBC or not __GNU_LIBRARY__. */
|