X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffnmatch.c;h=f772ecc970884517d5ba06d8ba94b42e8744e48b;hb=28546733a07f8078b9e6c21f52c2e3dcd096af0a;hp=525e6a85e81aa61027701fae2455382279ad1063;hpb=d87c39464604e74f580c7fae835be31a4c125c36;p=gnulib.git diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 525e6a85e..f772ecc97 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,31 +1,42 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1997 Free Software Foundation, Inc. -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. + NOTE: The canonical source of this file is maintained with the GNU C + Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. -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. + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. -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., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + This program 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 General Public License for more details. -#include -#include "fnmatch.h" + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS) -extern int errno; +#if HAVE_CONFIG_H +# include #endif -#if !__STDC__ -#define const +#include +#include +#include + +#if defined (STDC_HEADERS) || !defined (isascii) +# define ISASCII(c) 1 +#else +# define ISASCII(c) isascii(c) #endif +#define ISUPPER(c) (ISASCII (c) && isupper (c)) + +# ifndef errno +extern int errno; +# endif + /* Match STRING against the filename pattern PATTERN, returning zero if it matches, nonzero if not. */ int @@ -37,40 +48,42 @@ fnmatch (pattern, string, flags) register const char *p = pattern, *n = string; register char c; - if ((flags & ~__FNM_FLAGS) != 0) - { - errno = EINVAL; - return -1; - } +/* Note that this evaluates C many times. */ +# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c)) while ((c = *p++) != '\0') { + c = FOLD (c); + switch (c) { case '?': if (*n == '\0') return FNM_NOMATCH; - else if ((flags & FNM_PATHNAME) && *n == '/') + else if ((flags & FNM_FILE_NAME) && *n == '/') return FNM_NOMATCH; else if ((flags & FNM_PERIOD) && *n == '.' && - (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) return FNM_NOMATCH; break; case '\\': if (!(flags & FNM_NOESCAPE)) - c = *p++; - if (*n != c) + { + c = *p++; + c = FOLD (c); + } + if (FOLD (*n) != c) return FNM_NOMATCH; break; case '*': if ((flags & FNM_PERIOD) && *n == '.' && - (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) return FNM_NOMATCH; for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) - if (((flags & FNM_PATHNAME) && *n == '/') || + if (((flags & FNM_FILE_NAME) && *n == '/') || (c == '?' && *n == '\0')) return FNM_NOMATCH; @@ -79,8 +92,9 @@ fnmatch (pattern, string, flags) { char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; + c1 = FOLD (c1); for (--p; *n != '\0'; ++n) - if ((c == '[' || *n == c1) && + if ((c == '[' || FOLD (*n) == c1) && fnmatch (p, n, flags & ~FNM_PERIOD) == 0) return 0; return FNM_NOMATCH; @@ -95,7 +109,7 @@ fnmatch (pattern, string, flags) return FNM_NOMATCH; if ((flags & FNM_PERIOD) && *n == '.' && - (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/'))) + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) return FNM_NOMATCH; not = (*p == '!' || *p == '^'); @@ -110,13 +124,16 @@ fnmatch (pattern, string, flags) if (!(flags & FNM_NOESCAPE) && c == '\\') cstart = cend = *p++; + cstart = cend = FOLD (cstart); + if (c == '\0') /* [ (unterminated) loses. */ return FNM_NOMATCH; c = *p++; + c = FOLD (c); - if ((flags & FNM_PATHNAME) && c == '/') + if ((flags & FNM_FILE_NAME) && c == '/') /* [/] can never match. */ return FNM_NOMATCH; @@ -127,10 +144,12 @@ fnmatch (pattern, string, flags) cend = *p++; if (cend == '\0') return FNM_NOMATCH; + cend = FOLD (cend); + c = *p++; } - if (*n >= cstart && *n <= cend) + if (FOLD (*n) >= cstart && FOLD (*n) <= cend) goto matched; if (c == ']') @@ -150,7 +169,7 @@ fnmatch (pattern, string, flags) c = *p++; if (!(flags & FNM_NOESCAPE) && c == '\\') - /* 1003.2d11 is unclear if this is right. %%% */ + /* XXX 1003.2d11 is unclear if this is right. */ ++p; } if (not) @@ -159,15 +178,21 @@ fnmatch (pattern, string, flags) break; default: - if (c != *n) + if (c != FOLD (*n)) return FNM_NOMATCH; } ++n; } - if (*n == '\0' || ((flags & FNM_TARPATH) && *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 }