Index: stable/11/lib/libc/gen/fnmatch.c =================================================================== --- stable/11/lib/libc/gen/fnmatch.c (revision 322523) +++ stable/11/lib/libc/gen/fnmatch.c (revision 322524) @@ -1,309 +1,310 @@ /* * Copyright (c) 1989, 1993, 1994 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Guido van Rossum. * * Copyright (c) 2011 The FreeBSD Foundation * All rights reserved. * Portions of this software were developed by David Chisnall * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); /* * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6. * Compares a filename or pathname to a pattern. */ /* * Some notes on multibyte character support: * 1. Patterns with illegal byte sequences match nothing. * 2. Illegal byte sequences in the "string" argument are handled by treating * them as single-byte characters with a value of the first byte of the * sequence cast to wchar_t. * 3. Multibyte conversion state objects (mbstate_t) are passed around and * used for most, but not all, conversions. Further work will be required * to support state-dependent encodings. */ #include #include #include #include #include #include "collate.h" #define EOS '\0' #define RANGE_MATCH 1 #define RANGE_NOMATCH 0 #define RANGE_ERROR (-1) static int rangematch(const char *, wchar_t, int, char **, mbstate_t *); static int fnmatch1(const char *, const char *, const char *, int, mbstate_t, mbstate_t); int fnmatch(const char *pattern, const char *string, int flags) { static const mbstate_t initial; return (fnmatch1(pattern, string, string, flags, initial, initial)); } static int fnmatch1(const char *pattern, const char *string, const char *stringstart, int flags, mbstate_t patmbs, mbstate_t strmbs) { const char *bt_pattern, *bt_string; mbstate_t bt_patmbs, bt_strmbs; char *newp; char c; wchar_t pc, sc; size_t pclen, sclen; bt_pattern = bt_string = NULL; for (;;) { pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); if (pclen == (size_t)-1 || pclen == (size_t)-2) return (FNM_NOMATCH); pattern += pclen; sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs); if (sclen == (size_t)-1 || sclen == (size_t)-2) { sc = (unsigned char)*string; sclen = 1; memset(&strmbs, 0, sizeof(strmbs)); } switch (pc) { case EOS: if ((flags & FNM_LEADING_DIR) && sc == '/') return (0); if (sc == EOS) return (0); goto backtrack; case '?': if (sc == EOS) return (FNM_NOMATCH); if (sc == '/' && (flags & FNM_PATHNAME)) goto backtrack; if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) goto backtrack; string += sclen; break; case '*': c = *pattern; /* Collapse multiple stars. */ while (c == '*') c = *++pattern; if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) goto backtrack; /* Optimize for pattern with * at end or before /. */ if (c == EOS) if (flags & FNM_PATHNAME) return ((flags & FNM_LEADING_DIR) || strchr(string, '/') == NULL ? 0 : FNM_NOMATCH); else return (0); else if (c == '/' && flags & FNM_PATHNAME) { if ((string = strchr(string, '/')) == NULL) return (FNM_NOMATCH); break; } /* * First try the shortest match for the '*' that * could work. We can forget any earlier '*' since * there is no way having it match more characters * can help us, given that we are already here. */ bt_pattern = pattern, bt_patmbs = patmbs; bt_string = string, bt_strmbs = strmbs; break; case '[': if (sc == EOS) return (FNM_NOMATCH); if (sc == '/' && (flags & FNM_PATHNAME)) goto backtrack; if (sc == '.' && (flags & FNM_PERIOD) && (string == stringstart || ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) goto backtrack; switch (rangematch(pattern, sc, flags, &newp, &patmbs)) { case RANGE_ERROR: goto norm; case RANGE_MATCH: pattern = newp; break; case RANGE_NOMATCH: goto backtrack; } string += sclen; break; case '\\': if (!(flags & FNM_NOESCAPE)) { pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); - if (pclen == (size_t)-1 || pclen == (size_t)-2) + if (pclen == 0 || pclen == (size_t)-1 || + pclen == (size_t)-2) return (FNM_NOMATCH); pattern += pclen; } /* FALLTHROUGH */ default: norm: string += sclen; if (pc == sc) ; else if ((flags & FNM_CASEFOLD) && (towlower(pc) == towlower(sc))) ; else { backtrack: /* * If we have a mismatch (other than hitting * the end of the string), go back to the last * '*' seen and have it match one additional * character. */ if (bt_pattern == NULL) return (FNM_NOMATCH); sclen = mbrtowc(&sc, bt_string, MB_LEN_MAX, &bt_strmbs); if (sclen == (size_t)-1 || sclen == (size_t)-2) { sc = (unsigned char)*bt_string; sclen = 1; memset(&bt_strmbs, 0, sizeof(bt_strmbs)); } if (sc == EOS) return (FNM_NOMATCH); if (sc == '/' && flags & FNM_PATHNAME) return (FNM_NOMATCH); bt_string += sclen; pattern = bt_pattern, patmbs = bt_patmbs; string = bt_string, strmbs = bt_strmbs; } break; } } /* NOTREACHED */ } static int rangematch(const char *pattern, wchar_t test, int flags, char **newp, mbstate_t *patmbs) { int negate, ok; wchar_t c, c2; size_t pclen; const char *origpat; struct xlocale_collate *table = (struct xlocale_collate*)__get_locale()->components[XLC_COLLATE]; /* * A bracket expression starting with an unquoted circumflex * character produces unspecified results (IEEE 1003.2-1992, * 3.13.2). This implementation treats it like '!', for * consistency with the regular expression syntax. * J.T. Conklin (conklin@ngai.kaleida.com) */ if ( (negate = (*pattern == '!' || *pattern == '^')) ) ++pattern; if (flags & FNM_CASEFOLD) test = towlower(test); /* * A right bracket shall lose its special meaning and represent * itself in a bracket expression if it occurs first in the list. * -- POSIX.2 2.8.3.2 */ ok = 0; origpat = pattern; for (;;) { if (*pattern == ']' && pattern > origpat) { pattern++; break; } else if (*pattern == '\0') { return (RANGE_ERROR); } else if (*pattern == '/' && (flags & FNM_PATHNAME)) { return (RANGE_NOMATCH); } else if (*pattern == '\\' && !(flags & FNM_NOESCAPE)) pattern++; pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs); if (pclen == (size_t)-1 || pclen == (size_t)-2) return (RANGE_NOMATCH); pattern += pclen; if (flags & FNM_CASEFOLD) c = towlower(c); if (*pattern == '-' && *(pattern + 1) != EOS && *(pattern + 1) != ']') { if (*++pattern == '\\' && !(flags & FNM_NOESCAPE)) if (*pattern != EOS) pattern++; pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs); if (pclen == (size_t)-1 || pclen == (size_t)-2) return (RANGE_NOMATCH); pattern += pclen; if (c2 == EOS) return (RANGE_ERROR); if (flags & FNM_CASEFOLD) c2 = towlower(c2); if (table->__collate_load_error ? c <= test && test <= c2 : __wcollate_range_cmp(c, test) <= 0 && __wcollate_range_cmp(test, c2) <= 0 ) ok = 1; } else if (c == test) ok = 1; } *newp = (char *)pattern; return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); } Index: stable/11/lib/libc/tests/gen/fnmatch_testcases.h =================================================================== --- stable/11/lib/libc/tests/gen/fnmatch_testcases.h (revision 322523) +++ stable/11/lib/libc/tests/gen/fnmatch_testcases.h (revision 322524) @@ -1,176 +1,176 @@ /*- * Copyright (c) 2010 Jilles Tjoelker * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include struct testcase { const char *pattern; const char *string; int flags; int result; } testcases[] = { { "", "", 0, 0 }, { "a", "a", 0, 0 }, { "a", "b", 0, FNM_NOMATCH }, { "a", "A", 0, FNM_NOMATCH }, { "*", "a", 0, 0 }, { "*", "aa", 0, 0 }, { "*a", "a", 0, 0 }, { "*a", "b", 0, FNM_NOMATCH }, { "*a*", "b", 0, FNM_NOMATCH }, { "*a*b*", "ab", 0, 0 }, { "*a*b*", "qaqbq", 0, 0 }, { "*a*bb*", "qaqbqbbq", 0, 0 }, { "*a*bc*", "qaqbqbcq", 0, 0 }, { "*a*bb*", "qaqbqbb", 0, 0 }, { "*a*bc*", "qaqbqbc", 0, 0 }, { "*a*bb", "qaqbqbb", 0, 0 }, { "*a*bc", "qaqbqbc", 0, 0 }, { "*a*bb", "qaqbqbbq", 0, FNM_NOMATCH }, { "*a*bc", "qaqbqbcq", 0, FNM_NOMATCH }, { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaa", 0, FNM_NOMATCH }, { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaa", 0, 0 }, { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaaa", 0, 0 }, { ".*.*.*.*.*.*.*.*.*.*", ".........", 0, FNM_NOMATCH }, { ".*.*.*.*.*.*.*.*.*.*", "..........", 0, 0 }, { ".*.*.*.*.*.*.*.*.*.*", "...........", 0, 0 }, { "*?*?*?*?*?*?*?*?*?*?*", "123456789", 0, FNM_NOMATCH }, { "??????????*", "123456789", 0, FNM_NOMATCH }, { "*??????????", "123456789", 0, FNM_NOMATCH }, { "*?*?*?*?*?*?*?*?*?*?*", "1234567890", 0, 0 }, { "??????????*", "1234567890", 0, 0 }, { "*??????????", "1234567890", 0, 0 }, { "*?*?*?*?*?*?*?*?*?*?*", "12345678901", 0, 0 }, { "??????????*", "12345678901", 0, 0 }, { "*??????????", "12345678901", 0, 0 }, { "[x]", "x", 0, 0 }, { "[*]", "*", 0, 0 }, { "[?]", "?", 0, 0 }, { "[", "[", 0, 0 }, { "[[]", "[", 0, 0 }, { "[[]", "x", 0, FNM_NOMATCH }, { "[*]", "", 0, FNM_NOMATCH }, { "[*]", "x", 0, FNM_NOMATCH }, { "[?]", "x", 0, FNM_NOMATCH }, { "*[*]*", "foo*foo", 0, 0 }, { "*[*]*", "foo", 0, FNM_NOMATCH }, { "[0-9]", "0", 0, 0 }, { "[0-9]", "5", 0, 0 }, { "[0-9]", "9", 0, 0 }, { "[0-9]", "/", 0, FNM_NOMATCH }, { "[0-9]", ":", 0, FNM_NOMATCH }, { "[0-9]", "*", 0, FNM_NOMATCH }, { "[!0-9]", "0", 0, FNM_NOMATCH }, { "[!0-9]", "5", 0, FNM_NOMATCH }, { "[!0-9]", "9", 0, FNM_NOMATCH }, { "[!0-9]", "/", 0, 0 }, { "[!0-9]", ":", 0, 0 }, { "[!0-9]", "*", 0, 0 }, { "*[0-9]", "a0", 0, 0 }, { "*[0-9]", "a5", 0, 0 }, { "*[0-9]", "a9", 0, 0 }, { "*[0-9]", "a/", 0, FNM_NOMATCH }, { "*[0-9]", "a:", 0, FNM_NOMATCH }, { "*[0-9]", "a*", 0, FNM_NOMATCH }, { "*[!0-9]", "a0", 0, FNM_NOMATCH }, { "*[!0-9]", "a5", 0, FNM_NOMATCH }, { "*[!0-9]", "a9", 0, FNM_NOMATCH }, { "*[!0-9]", "a/", 0, 0 }, { "*[!0-9]", "a:", 0, 0 }, { "*[!0-9]", "a*", 0, 0 }, { "*[0-9]", "a00", 0, 0 }, { "*[0-9]", "a55", 0, 0 }, { "*[0-9]", "a99", 0, 0 }, { "*[0-9]", "a0a0", 0, 0 }, { "*[0-9]", "a5a5", 0, 0 }, { "*[0-9]", "a9a9", 0, 0 }, { "\\*", "*", 0, 0 }, { "\\?", "?", 0, 0 }, { "\\[x]", "[x]", 0, 0 }, { "\\[", "[", 0, 0 }, { "\\\\", "\\", 0, 0 }, { "*\\**", "foo*foo", 0, 0 }, { "*\\**", "foo", 0, FNM_NOMATCH }, { "*\\\\*", "foo\\foo", 0, 0 }, { "*\\\\*", "foo", 0, FNM_NOMATCH }, { "\\(", "(", 0, 0 }, { "\\a", "a", 0, 0 }, { "\\*", "a", 0, FNM_NOMATCH }, { "\\?", "a", 0, FNM_NOMATCH }, { "\\*", "\\*", 0, FNM_NOMATCH }, { "\\?", "\\?", 0, FNM_NOMATCH }, { "\\[x]", "\\[x]", 0, FNM_NOMATCH }, { "\\[x]", "\\x", 0, FNM_NOMATCH }, { "\\[", "\\[", 0, FNM_NOMATCH }, { "\\(", "\\(", 0, FNM_NOMATCH }, { "\\a", "\\a", 0, FNM_NOMATCH }, { "\\", "\\", 0, FNM_NOMATCH }, - { "\\", "", 0, 0 }, + { "\\", "", 0, FNM_NOMATCH }, { "\\*", "\\*", FNM_NOESCAPE, 0 }, { "\\?", "\\?", FNM_NOESCAPE, 0 }, { "\\", "\\", FNM_NOESCAPE, 0 }, { "\\\\", "\\", FNM_NOESCAPE, FNM_NOMATCH }, { "\\\\", "\\\\", FNM_NOESCAPE, 0 }, { "*\\*", "foo\\foo", FNM_NOESCAPE, 0 }, { "*\\*", "foo", FNM_NOESCAPE, FNM_NOMATCH }, { "*", ".", FNM_PERIOD, FNM_NOMATCH }, { "?", ".", FNM_PERIOD, FNM_NOMATCH }, { ".*", ".", 0, 0 }, { ".*", "..", 0, 0 }, { ".*", ".a", 0, 0 }, { "[0-9]", ".", FNM_PERIOD, FNM_NOMATCH }, { "a*", "a.", 0, 0 }, { "a/a", "a/a", FNM_PATHNAME, 0 }, { "a/*", "a/a", FNM_PATHNAME, 0 }, { "*/a", "a/a", FNM_PATHNAME, 0 }, { "*/*", "a/a", FNM_PATHNAME, 0 }, { "a*b/*", "abbb/x", FNM_PATHNAME, 0 }, { "a*b/*", "abbb/.x", FNM_PATHNAME, 0 }, { "*", "a/a", FNM_PATHNAME, FNM_NOMATCH }, { "*/*", "a/a/a", FNM_PATHNAME, FNM_NOMATCH }, { "b/*", "b/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH }, { "b*/*", "a/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH }, { "b/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0 }, { "b*/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0 }, { "a", "A", FNM_CASEFOLD, 0 }, { "A", "a", FNM_CASEFOLD, 0 }, { "[a]", "A", FNM_CASEFOLD, 0 }, { "[A]", "a", FNM_CASEFOLD, 0 }, { "a", "b", FNM_CASEFOLD, FNM_NOMATCH }, { "a", "a/b", FNM_PATHNAME, FNM_NOMATCH }, { "*", "a/b", FNM_PATHNAME, FNM_NOMATCH }, { "*b", "a/b", FNM_PATHNAME, FNM_NOMATCH }, { "a", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 }, { "*", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 }, { "*", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 }, { "*a", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 }, { "*", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH }, { "*a", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH }, { "a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH }, }; Index: stable/11 =================================================================== --- stable/11 (revision 322523) +++ stable/11 (revision 322524) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r322368,322371