X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..fbd86d4cc20b02a10edcca92fb7ae0a143e63cc4:/gen/FreeBSD/fnmatch.c.patch

diff --git a/gen/FreeBSD/fnmatch.c.patch b/gen/FreeBSD/fnmatch.c.patch
index b46433b..5145423 100644
--- a/gen/FreeBSD/fnmatch.c.patch
+++ b/gen/FreeBSD/fnmatch.c.patch
@@ -1,5 +1,5 @@
 --- fnmatch.c.orig	2004-11-25 11:38:00.000000000 -0800
-+++ fnmatch.c	2005-02-25 00:23:44.000000000 -0800
++++ fnmatch.c	2005-03-30 14:33:09.000000000 -0800
 @@ -40,6 +40,8 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.16 2004/07/29 03:13:10 tjr Exp $");
@@ -9,18 +9,25 @@
  /*
   * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
   * Compares a filename or pathname to a pattern.
-@@ -70,8 +72,8 @@
+@@ -66,12 +68,15 @@
+ 
+ #define	EOS	'\0'
+ 
++#if __DARWIN_UNIX03
++#define RETURN_ERROR	2	/* neither 0 or FNM_NOMATCH */
++#endif /* __DARWIN_UNIX03 */
+ #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 *, int, mbstate_t, mbstate_t);
-+static int rangematch(const char *, wchar_t, int, char **, mbstate_t *, locale_t);
++__private_extern__ int rangematch(const char *, wchar_t, const char *, int, char **, char **, mbstate_t *, mbstate_t *, locale_t);
 +static int fnmatch1(const char *, const char *, int, mbstate_t, mbstate_t, locale_t);
  
  int
  fnmatch(pattern, string, flags)
-@@ -80,14 +82,15 @@
+@@ -80,27 +85,32 @@
  {
  	static const mbstate_t initial;
  
@@ -37,22 +44,28 @@
 +	locale_t loc;
  {
  	const char *stringstart;
- 	char *newp;
-@@ -96,11 +99,11 @@
+-	char *newp;
++	char *newp, *news;
+ 	char c;
+ 	wchar_t pc, sc;
  	size_t pclen, sclen;
  
  	for (stringstart = string;;) {
 -		pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs);
 +		pclen = mbrtowc_l(&pc, pattern, MB_LEN_MAX, &patmbs, loc);
  		if (pclen == (size_t)-1 || pclen == (size_t)-2)
++#if __DARWIN_UNIX03
++			return (RETURN_ERROR);
++#else /* !__DARWIN_UNIX03 */
  			return (FNM_NOMATCH);
++#endif /* __DARWIN_UNIX03 */
  		pattern += pclen;
 -		sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs);
 +		sclen = mbrtowc_l(&sc, string, MB_LEN_MAX, &strmbs, loc);
  		if (sclen == (size_t)-1 || sclen == (size_t)-2) {
  			sc = (unsigned char)*string;
  			sclen = 1;
-@@ -150,10 +153,10 @@
+@@ -150,10 +160,10 @@
  			/* General case, use recursion. */
  			while (sc != EOS) {
  				if (!fnmatch1(pattern, string,
@@ -66,16 +79,28 @@
  				if (sclen == (size_t)-1 ||
  				    sclen == (size_t)-2) {
  					sc = (unsigned char)*string;
-@@ -176,7 +179,7 @@
+@@ -175,35 +185,45 @@
+ 			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
  				return (FNM_NOMATCH);
  
- 			switch (rangematch(pattern, sc, flags, &newp,
+-			switch (rangematch(pattern, sc, flags, &newp,
 -			    &patmbs)) {
-+			    &patmbs, loc)) {
++			switch (rangematch(pattern, sc, string + sclen, flags,
++			    &newp, &news, &patmbs, &strmbs, loc)) {
  			case RANGE_ERROR:
++#if __DARWIN_UNIX03
++				return (RETURN_ERROR);
++#else /* !__DARWIN_UNIX03 */
  				goto norm;
++#endif /* __DARWIN_UNIX03 */
  			case RANGE_MATCH:
-@@ -189,8 +192,8 @@
+ 				pattern = newp;
++				string = news;
+ 				break;
+ 			case RANGE_NOMATCH:
+ 				return (FNM_NOMATCH);
+ 			}
+-			string += sclen;
  			break;
  		case '\\':
  			if (!(flags & FNM_NOESCAPE)) {
@@ -84,9 +109,20 @@
 +				pclen = mbrtowc_l(&pc, pattern, MB_LEN_MAX,
 +				    &patmbs, loc);
  				if (pclen == (size_t)-1 || pclen == (size_t)-2)
++#if __DARWIN_UNIX03
++					return (RETURN_ERROR);
++#else /* !__DARWIN_UNIX03 */
  					return (FNM_NOMATCH);
++#endif /* __DARWIN_UNIX03 */
  				if (pclen == 0)
-@@ -203,7 +206,7 @@
+ 					pc = '\\';
+ 				pattern += pclen;
+ 			}
+ 			/* FALLTHROUGH */
+ 		default:
++#if !__DARWIN_UNIX03
+ 		norm:
++#endif /* !__DARWIN_UNIX03 */
  			if (pc == sc)
  				;
  			else if ((flags & FNM_CASEFOLD) &&
@@ -95,22 +131,38 @@
  				;
  			else
  				return (FNM_NOMATCH);
-@@ -215,12 +218,13 @@
+@@ -214,18 +234,22 @@
+ 	/* NOTREACHED */
  }
  
- static int
+-static int
 -rangematch(pattern, test, flags, newp, patmbs)
-+rangematch(pattern, test, flags, newp, patmbs, loc)
- 	const char *pattern;
+-	const char *pattern;
++#ifndef BUILDING_VARIANT
++__private_extern__ int
++rangematch(pattern, test, string, flags, newp, news, patmbs, strmbs, loc)
++	const char *pattern, *string;
  	wchar_t test;
  	int flags;
- 	char **newp;
- 	mbstate_t *patmbs;
+-	char **newp;
+-	mbstate_t *patmbs;
++	char **newp, **news;
++	mbstate_t *patmbs, *strmbs;
 +	locale_t loc;
  {
- 	int negate, ok;
+-	int negate, ok;
++	int negate, ok, special;
  	wchar_t c, c2;
-@@ -238,7 +242,7 @@
+-	size_t pclen;
+-	const char *origpat;
++	wchar_t buf[STR_LEN];	/* STR_LEN defined in collate.h */
++	size_t pclen, sclen, len;
++	const char *origpat, *cp, *savestring;
++	mbstate_t save;
+ 
+ 	/*
+ 	 * A bracket expression starting with an unquoted circumflex
+@@ -238,7 +262,7 @@
  		++pattern;
  
  	if (flags & FNM_CASEFOLD)
@@ -119,15 +171,126 @@
  
  	/*
  	 * A right bracket shall lose its special meaning and represent
-@@ -258,20 +262,20 @@
+@@ -248,8 +272,8 @@
+ 	ok = 0;
+ 	origpat = pattern;
+ 	for (;;) {
++		c = 0;
+ 		if (*pattern == ']' && pattern > origpat) {
+-			pattern++;
+ 			break;
+ 		} else if (*pattern == '\0') {
+ 			return (RANGE_ERROR);
+@@ -258,39 +282,188 @@
  			return (RANGE_NOMATCH);
  		} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
  			pattern++;
 -		pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs);
-+		pclen = mbrtowc_l(&c, pattern, MB_LEN_MAX, patmbs, loc);
- 		if (pclen == (size_t)-1 || pclen == (size_t)-2)
- 			return (RANGE_NOMATCH);
- 		pattern += pclen;
+-		if (pclen == (size_t)-1 || pclen == (size_t)-2)
+-			return (RANGE_NOMATCH);
+-		pattern += pclen;
++		else if (*pattern == '[' && ((special = *(pattern + 1)) == '.' || special == '=' || special == ':')) {
++			cp = (pattern += 2);
++			while(cp = strchr(cp, special)) {
++				if (*(cp + 1) == ']')
++					break;
++				cp++;
++			}
++			if (!cp)
++				return (RANGE_ERROR);
++			if (special == '.') {
++treat_like_collating_symbol:
++				len = __collate_collating_symbol(buf, STR_LEN, pattern, cp - pattern, patmbs, loc);
++				if (len == (size_t)-1 || len == 0)
++					return (RANGE_ERROR);
++				pattern = cp + 2;
++				if (len > 1) {
++					wchar_t *wp, sc;
++					/* no multi-character collation symbols as start of range */
++					if (*(cp + 2) == '-' && *(cp + 3) != EOS
++					    && *(cp + 3) != ']')
++						return (RANGE_ERROR);
++					wp = buf;
++					if (test != *wp++)
++						continue;
++					if (len == 1) {
++						ok = 1;
++						break;
++					}
++					memcpy(&save, strmbs, sizeof(save));
++					savestring = string;
++					while (--len > 0) {
++						sclen = mbrtowc_l(&sc, string, MB_LEN_MAX, strmbs, loc);
++						if (sclen == (size_t)-1 || sclen == (size_t)-2) {
++							sc = (unsigned char)*string;
++							sclen = 1;
++							memset(&strmbs, 0, sizeof(strmbs));
++						}
++						if (sc != *wp++) {
++							memcpy(strmbs, &save, sizeof(save));
++							string = savestring;
++							break;
++						}
++						string += sclen;
++					}
++					if (len == 0) {
++						ok = 1;
++						break;
++					}
++					continue; /* no match */
++				}
++				c = *buf;
++			} else if (special == '=') {
++				int ec;
++				memcpy(&save, patmbs, sizeof(save));
++				ec = __collate_equiv_class(pattern, cp - pattern, patmbs, loc);
++				if (ec < 0)
++					return (RANGE_ERROR);
++				if (ec == 0) {
++					memcpy(patmbs, &save, sizeof(save));
++					goto treat_like_collating_symbol;
++				}
++				pattern = cp + 2;
++				/* no equivalence classes as start of range */
++				if (*(cp + 2) == '-' && *(cp + 3) != EOS &&
++				    *(cp + 3) != ']')
++					return (RANGE_ERROR);
++				len = __collate_equiv_match(ec, NULL, 0, test, string, strlen(string), strmbs, &sclen, loc);
++				if (len < 0)
++					return (RANGE_ERROR);
++				if (len > 0) {
++					ok = 1;
++					string += sclen;
++					break;
++				}
++				continue;
++			} else { /* special == ':' */
++				wctype_t charclass;
++				char name[CHARCLASS_NAME_MAX + 1];
++				/* no character classes as start of range */
++				if (*(cp + 2) == '-' && *(cp + 3) != EOS &&
++				    *(cp + 3) != ']')
++					return (RANGE_ERROR);
++				/* assume character class names are ascii */
++				if (cp - pattern > CHARCLASS_NAME_MAX)
++					return (RANGE_ERROR);
++				strlcpy(name, pattern, cp - pattern + 1);
++				pattern = cp + 2;
++				if ((charclass = wctype(name)) == 0)
++					return (RANGE_ERROR);
++				if (iswctype_l(test, charclass, loc)) {
++					ok = 1;
++					break;
++				}
++				continue;
++			}
++		}
++		if (!c) {
++			pclen = mbrtowc_l(&c, pattern, MB_LEN_MAX, patmbs, loc);
++			if (pclen == (size_t)-1 || pclen == (size_t)-2)
++				return (RANGE_ERROR);
++			pattern += pclen;
++		}
  
  		if (flags & FNM_CASEFOLD)
 -			c = towlower(c);
@@ -141,11 +304,32 @@
 -			pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs);
 +			pclen = mbrtowc_l(&c2, pattern, MB_LEN_MAX, patmbs, loc);
  			if (pclen == (size_t)-1 || pclen == (size_t)-2)
- 				return (RANGE_NOMATCH);
+-				return (RANGE_NOMATCH);
++				return (RANGE_ERROR);
  			pattern += pclen;
-@@ -279,12 +283,12 @@
+ 			if (c2 == EOS)
  				return (RANGE_ERROR);
  
++			if (c2 == '[' && (special = *pattern) == '.' || special == '=' || special == ':') {
++				/* no equivalence classes or character classes as end of range */
++				if (special == '=' || special == ':')
++					return (RANGE_ERROR);
++				cp = ++pattern;
++				while(cp = strchr(cp, special)) {
++					if (*(cp + 1) == ']')
++						break;
++					cp++;
++				}
++				if (!cp)
++					return (RANGE_ERROR);
++				len = __collate_collating_symbol(buf, STR_LEN, pattern, cp - pattern, patmbs, loc);
++				/* no multi-character collation symbols as end of range */
++				if (len != 1)
++					return (RANGE_ERROR);
++				pattern = cp + 2;
++				c2 = *buf;
++			}
++
  			if (flags & FNM_CASEFOLD)
 -				c2 = towlower(c2);
 +				c2 = towlower_l(c2, loc);
@@ -155,8 +339,48 @@
  			    c <= test && test <= c2 :
 -			       __collate_range_cmp(c, test) <= 0
 -			    && __collate_range_cmp(test, c2) <= 0
+-			   )
 +			       __collate_range_cmp(c, test, loc) <= 0
 +			    && __collate_range_cmp(test, c2, loc) <= 0
- 			   )
++			   ) {
  				ok = 1;
- 		} else if (c == test)
+-		} else if (c == test)
++				break;
++			}
++		} else if (c == test) {
+ 			ok = 1;
++			break;
++		}
+ 	}
++	/* go to end of bracket expression */
++	special = 0;
++	while(*pattern != ']') {
++		if (*pattern == 0)
++			return (RANGE_ERROR);
++		if (*pattern == special) {
++			if (*++pattern == ']') {
++				special = 0;
++				pattern++;
++			}
++			continue;
++		}
++		if (!special && *pattern == '[') {
++			special = *++pattern;
++			if (special != '.' && special != '=' && special != ':')
++				special = 0;
++			else
++				pattern++;
++			continue;
++		}
++		pclen = mbrtowc_l(&c, pattern, MB_LEN_MAX, patmbs, loc);
++		if (pclen == (size_t)-1 || pclen == (size_t)-2)
++			return (RANGE_ERROR);
++		pattern += pclen;
++ 	}
+ 
+-	*newp = (char *)pattern;
++	*newp = (char *)++pattern;
++	*news = (char *)string;
+ 	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
+ }
++#endif /* BUILDING_VARIANT */