#define ABORT_ALL -1
#define ABORT_TO_STARSTAR -2
-#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 && strncmp(class, litmatch, len) == 0)
+#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \
+ && *(class) == *(litmatch) \
+ && strncmp((char*)class, litmatch, len) == 0)
#if defined STDC_HEADERS || !defined isascii
# define ISASCII(c) 1
int wildmatch_iteration_count;
#endif
-static int domatch(const unsigned char *p, const unsigned char *text)
+static int domatch(const uchar *p, const uchar *text)
{
int matched, special;
- unsigned char ch, prev;
+ uchar ch, prev;
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count++;
if (*p == '\0') {
/* Trailing "**" matches everything. Trailing "*" matches
* only if there are no more slash characters. */
- return special? TRUE : strchr(text, '/') == NULL;
+ return special? TRUE : strchr((char*)text, '/') == NULL;
}
for ( ; *text; text++) {
if ((matched = domatch(p, text)) != FALSE) {
matched = FALSE;
do {
if (!ch)
- return FALSE;
+ return ABORT_ALL;
if (ch == '\\') {
ch = *++p;
if (!ch)
- return FALSE;
+ return ABORT_ALL;
if (*text == ch)
matched = TRUE;
}
if (ch == '\\') {
ch = *++p;
if (!ch)
- return FALSE;
+ return ABORT_ALL;
}
if (*text <= ch && *text >= prev)
matched = TRUE;
ch = 0; /* This makes "prev" get set to 0. */
}
else if (ch == '[' && p[1] == ':') {
- unsigned const char *s = p += 2;
+ const uchar *s;
int i;
- while ((ch = *p) && (ch != ':' || p[1] != ']')) p++;
+ for (s = p += 2; (ch = *p) && ch != ']'; p++) {}
if (!ch)
- return FALSE;
- i = p - s;
- ch = *text;
- if ((CC_EQ(s,i, "alnum") && ISALNUM(ch))
- || (CC_EQ(s,i, "alpha") && ISALPHA(ch))
- || (CC_EQ(s,i, "blank") && ISBLANK(ch))
- || (CC_EQ(s,i, "cntrl") && ISCNTRL(ch))
- || (CC_EQ(s,i, "digit") && ISDIGIT(ch))
- || (CC_EQ(s,i, "graph") && ISGRAPH(ch))
- || (CC_EQ(s,i, "lower") && ISLOWER(ch))
- || (CC_EQ(s,i, "print") && ISPRINT(ch))
- || (CC_EQ(s,i, "punct") && ISPUNCT(ch))
- || (CC_EQ(s,i, "space") && ISSPACE(ch))
- || (CC_EQ(s,i, "upper") && ISUPPER(ch))
- || (CC_EQ(s,i,"xdigit") && ISXDIGIT(ch)))
- matched = TRUE;
- p++;
+ return ABORT_ALL;
+ i = p - s - 1;
+ if (i < 0 || p[-1] != ':') {
+ /* Didn't find ":]", so treat like a normal set. */
+ p = s - 2;
+ ch = '[';
+ if (*text == ch)
+ matched = TRUE;
+ continue;
+ }
+ if (CC_EQ(s,i, "alnum")) {
+ if (ISALNUM(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "alpha")) {
+ if (ISALPHA(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "blank")) {
+ if (ISBLANK(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "cntrl")) {
+ if (ISCNTRL(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "digit")) {
+ if (ISDIGIT(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "graph")) {
+ if (ISGRAPH(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "lower")) {
+ if (ISLOWER(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "print")) {
+ if (ISPRINT(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "punct")) {
+ if (ISPUNCT(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "space")) {
+ if (ISSPACE(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "upper")) {
+ if (ISUPPER(*text))
+ matched = TRUE;
+ }
+ else if (CC_EQ(s,i, "xdigit")) {
+ if (ISXDIGIT(*text))
+ matched = TRUE;
+ }
+ else /* malformed [:class:] string */
+ return ABORT_ALL;
ch = 0; /* This makes "prev" get set to 0. */
}
else if (*text == ch)
matched = TRUE;
} while (prev = ch, (ch = *++p) != ']');
- if (matched == special)
+ if (matched == special || *text == '/')
return FALSE;
continue;
}
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
- return domatch((const unsigned char*)p, (const unsigned char*)t) == TRUE;
+ return domatch((const uchar*)p, (const uchar*)t) == TRUE;
}