 @@ -1,14 +1,14 @@
-/*	$NetBSD: glob.c,v 1.36 2016/09/04 18:27:08 joerg Exp $	*/
+/*	$NetBSD: glob.c,v 1.37 2017/04/26 14:56:54 christos Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Guido van Rossum.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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 <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.36 2016/09/04 18:27:08 joerg Exp $");
+__RCSID("$NetBSD: glob.c,v 1.37 2017/04/26 14:56:54 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
+ *
  * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
+ *
  * Optional extra services, controlled by flags not defined by POSIX:
+ *
  * GLOB_MAGCHAR:
  *	Set in gl_flags if pattern contained a globbing character.
  * GLOB_NOMAGIC:
 @@ -926,78 +926,93 @@ globextend(const Char *path, glob_t *pgl
 	if ((pglob->gl_flags & GLOB_LIMIT) &&
 	    (newsize + limit->l_string) >= GLOB_LIMIT_STRING)
 		goto nospace;
 	return copy == NULL ? GLOB_NOSPACE : 0;
 nospace:
 	errno = 0;
 	return GLOB_NOSPACE;
+}
 /*
- * pattern matching function for filenames.  Each occurrence of the *
+ * pattern matching function for filenames.
  * pattern causes a recursion level.
  */
 static int
 match(const Char *name, const Char *pat, const Char *patend)
+{
 	int ok, negate_range;
 	Char c, k;
 	const Char *patNext, *nameNext, *nameStart, *nameEnd;
 	_DIAGASSERT(name != NULL);
 	_DIAGASSERT(pat != NULL);
 	_DIAGASSERT(patend != NULL);
 	patNext = pat;
-	while (pat < patend) {
+	nameStart = nameNext = name;
-		c = *pat++;
+	nameEnd = NULL;
 	while (pat < patend || *name) {
 		c = *pat;
 		if (*name == EOS)
 			nameEnd = name;
 		switch (c & M_MASK) {
 		case M_ALL:
-			while (pat < patend && (*pat & M_MASK) == M_ALL)
+			while (pat[1] == '*') pat++;
-				pat++;	/* eat consecutive '*' */
+			patNext = pat;
-			if (pat == patend)
+			nameNext = name + 1;
-				return 1;
+			pat++;
-			for (; !match(name, pat, patend); name++)
+			continue;
 				if (*name == EOS)
 					return 0;
 			return 1;
 		case M_ONE:
-			if (*name++ == EOS)
+			if (*name == EOS)
-				return 0;
+				break;
-			break;
+			pat++;
 			name++;
 			continue;
 		case M_SET:
 			ok = 0;
-			if ((k = *name++) == EOS)
+			if ((k = *name) == EOS)
-				return 0;
+				break;
 			pat++;
 			name++;
 			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
 				++pat;
 			while (((c = *pat++) & M_MASK) != M_END)
 				if ((*pat & M_MASK) == M_RNG) {
 					if (c <= k && k <= pat[1])
 						ok = 1;
 					pat += 2;
 				} else if (c == k)
 					ok = 1;
 			if (ok == negate_range)
-				return 0;
+				break;
-			break;
+			continue;
 		default:
-			if (*name++ != c)
+			if (*name != c)
-				return 0;
+				break;
-			break;
+			pat++;
 			name++;
 			continue;
+		}
 		if (nameNext != nameStart
 		    && (nameEnd == NULL || nameNext <= nameEnd)) {
 			pat = patNext;
 			name = nameNext;
 			continue;
+		}
 		return 0;
+	}
-	return *name == EOS;
+	return 1;
+}
 /* Free allocated data belonging to a glob_t structure. */
 void
 globfree(glob_t *pglob)
+{
 	size_t i;
 	char **pp;
 	_DIAGASSERT(pglob != NULL);
 	if (pglob->gl_pathv != NULL) {
 		pp = pglob->gl_pathv + pglob->gl_offs;