beta: rc-1.6b3

1 files changed, 4 insertions, 14 deletions

diff --git a/glob.c b/glob.c
index cd62d65..ac26203 100644
--- a/glob.c
+++ b/glob.c
@@ -34,23 +34,13 @@ static List *sort(List *);
 
 extern bool lmatch(List *s, List *p) {
 	List *q;
-	int i;
-	bool okay;
 	if (s == NULL) {
 		if (p == NULL) /* null matches null */
 			return TRUE;
-		for (; p != NULL; p = p->n) { /* one or more stars match null */
-			if (*p->w != '\0') { /* the null string is a special case; it does *not* match () */
-				okay = TRUE;
-				for (i = 0; p->w[i] != '\0'; i++)
-					if (p->w[i] != '*' || p->m[i] != 1) {
-						okay = FALSE;
-						break;
-					}
-				if (okay)
-					return TRUE;
-			}
-		}
+		for (; p != NULL; p = p->n) /* one or more stars match null */
+			if (strspn(p->w, "*") == strlen(p->w) &&
+			    p->m != NULL && strlen(p->m) == strlen(p->w))
+				return TRUE;
 		return FALSE;
 	}
 	for (; s != NULL; s = s->n)