From 43da5e839f0a287206b5aafd8784e8390481fa73 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Apr 2017 17:17:31 +0200 Subject: remove old fnmatch implementation --- extra/Configs/Config.in | 15 --- libc/misc/fnmatch/Makefile.in | 2 +- libc/misc/fnmatch/fnmatch_old.c | 219 ---------------------------------------- 3 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 libc/misc/fnmatch/fnmatch_old.c diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index b329f88b7..974fc7a1a 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1856,21 +1856,6 @@ config UCLIBC_HAS_FNMATCH help POSIX fnmatch. -config UCLIBC_HAS_FNMATCH_OLD - bool "Use the older (stable) fnmatch code" - depends on UCLIBC_HAS_FNMATCH - default y - help - There are two versions of fnmatch. The older (stable) version has - been in uClibc for quite a long time but hasn't seen too many - updates. It also has some known issues when dealing with uncommon - corner cases and multibyte/unicode strings. However, it is quite - a bit smaller than the newer version. - - If the older version has worked for you and you don't need unicode - support, then stick with the old version (and say Y here). - Otherwise, you should use the new version (and say N here). - config UCLIBC_HAS_WORDEXP bool "Support the wordexp() interface" depends on UCLIBC_HAS_GLOB diff --git a/libc/misc/fnmatch/Makefile.in b/libc/misc/fnmatch/Makefile.in index ab43e00f1..81f3d31d2 100644 --- a/libc/misc/fnmatch/Makefile.in +++ b/libc/misc/fnmatch/Makefile.in @@ -7,7 +7,7 @@ subdirs += libc/misc/fnmatch -CSRC-y := $(if $(UCLIBC_HAS_FNMATCH_OLD),fnmatch_old.c,fnmatch.c) +CSRC-y := fnmatch.c MISC_FNMATCH_DIR := $(top_srcdir)libc/misc/fnmatch MISC_FNMATCH_OUT := $(top_builddir)libc/misc/fnmatch diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c deleted file mode 100644 index 8da456333..000000000 --- a/libc/misc/fnmatch/fnmatch_old.c +++ /dev/null @@ -1,219 +0,0 @@ -/* Copyright (C) 1991, 1992, 1993, 1996 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. - -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, see . */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include - - -/* 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 - -# define ISUPPER(c) (ISASCII (c) && isupper (c)) - - -/* Match STRING against the filename pattern PATTERN, returning zero if - it matches, nonzero if not. */ -int fnmatch(const char *pattern, const char *string, int flags) -{ - register const char *p = pattern, *n = string; - register char c; - -/* 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_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(*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; - - { - char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; - - c1 = FOLD(c1); - for (--p; *n != '\0'; ++n) - if ((c == '[' || FOLD(*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. */ - register int not; - - if (*n == '\0') - return FNM_NOMATCH; - - if ((flags & FNM_PERIOD) && *n == '.' && - (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) - return FNM_NOMATCH; - - not = (*p == '!' || *p == '^'); - if (not) - ++p; - - c = *p++; - for (;;) { - register char cstart = c, cend = c; - - if (!(flags & FNM_NOESCAPE) && c == '\\') { - if (*p == '\0') - return FNM_NOMATCH; - cstart = cend = *p++; - } - - cstart = cend = FOLD(cstart); - - if (c == '\0') - /* [ (unterminated) loses. */ - return FNM_NOMATCH; - - c = *p++; - c = FOLD(c); - - if ((flags & FNM_FILE_NAME) && c == '/') - /* [/] can never match. */ - return FNM_NOMATCH; - - if (c == '-' && *p != ']') { - cend = *p++; - if (!(flags & FNM_NOESCAPE) && cend == '\\') - cend = *p++; - if (cend == '\0') - return FNM_NOMATCH; - cend = FOLD(cend); - - c = *p++; - } - - if (FOLD(*n) >= cstart && FOLD(*n) <= cend) - goto matched; - - 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; - } - } - if (not) - return FNM_NOMATCH; - } - break; - - default: - if (c != FOLD(*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 -} -libc_hidden_def(fnmatch) -#endif /* _LIBC or not __GNU_LIBRARY__. */ -- cgit v1.2.3