diff options
Diffstat (limited to 'wildmatch.c')
| -rw-r--r-- | wildmatch.c | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/wildmatch.c b/wildmatch.c index 2d3ed84364..2a655fa7d4 100644 --- a/wildmatch.c +++ b/wildmatch.c @@ -18,9 +18,6 @@ typedef unsigned char uchar; #define NEGATE_CLASS '!' #define NEGATE_CLASS2 '^' -#define FALSE 0 -#define TRUE 1 - #define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \ && *(class) == *(litmatch) \ && strncmp((char*)class, litmatch, len) == 0) @@ -64,7 +61,7 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) int matched, match_slash, negated; uchar t_ch, prev_ch; if ((t_ch = *text) == '\0' && p_ch != '*') - return ABORT_ALL; + return WM_ABORT_ALL; if (force_lower_case && ISUPPER(t_ch)) t_ch = tolower(t_ch); if (force_lower_case && ISUPPER(p_ch)) @@ -77,12 +74,12 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) /* FALLTHROUGH */ default: if (t_ch != p_ch) - return NOMATCH; + return WM_NOMATCH; continue; case '?': /* Match anything but '/'. */ if (t_ch == '/') - return NOMATCH; + return WM_NOMATCH; continue; case '*': if (*++p == '*') { @@ -101,135 +98,136 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) * both foo/bar and foo/a/bar. */ if (p[0] == '/' && - dowild(p + 1, text, force_lower_case) == MATCH) - return MATCH; - match_slash = TRUE; + dowild(p + 1, text, force_lower_case) == WM_MATCH) + return WM_MATCH; + match_slash = 1; } else - return ABORT_MALFORMED; + return WM_ABORT_MALFORMED; } else - match_slash = FALSE; + match_slash = 0; if (*p == '\0') { /* Trailing "**" matches everything. Trailing "*" matches * only if there are no more slash characters. */ if (!match_slash) { if (strchr((char*)text, '/') != NULL) - return NOMATCH; + return WM_NOMATCH; } - return MATCH; + return WM_MATCH; } while (1) { if (t_ch == '\0') break; - if ((matched = dowild(p, text, force_lower_case)) != NOMATCH) { - if (!match_slash || matched != ABORT_TO_STARSTAR) + if ((matched = dowild(p, text, force_lower_case)) != WM_NOMATCH) { + if (!match_slash || matched != WM_ABORT_TO_STARSTAR) return matched; } else if (!match_slash && t_ch == '/') - return ABORT_TO_STARSTAR; + return WM_ABORT_TO_STARSTAR; t_ch = *++text; } - return ABORT_ALL; + return WM_ABORT_ALL; case '[': p_ch = *++p; #ifdef NEGATE_CLASS2 if (p_ch == NEGATE_CLASS2) p_ch = NEGATE_CLASS; #endif - /* Assign literal TRUE/FALSE because of "matched" comparison. */ - negated = p_ch == NEGATE_CLASS? TRUE : FALSE; + /* Assign literal 1/0 because of "matched" comparison. */ + negated = p_ch == NEGATE_CLASS ? 1 : 0; if (negated) { /* Inverted character class. */ p_ch = *++p; } prev_ch = 0; - matched = FALSE; + matched = 0; do { if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; if (p_ch == '\\') { p_ch = *++p; if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; if (t_ch == p_ch) - matched = TRUE; + matched = 1; } else if (p_ch == '-' && prev_ch && p[1] && p[1] != ']') { p_ch = *++p; if (p_ch == '\\') { p_ch = *++p; if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; } if (t_ch <= p_ch && t_ch >= prev_ch) - matched = TRUE; + matched = 1; p_ch = 0; /* This makes "prev_ch" get set to 0. */ } else if (p_ch == '[' && p[1] == ':') { const uchar *s; int i; for (s = p += 2; (p_ch = *p) && p_ch != ']'; p++) {} /*SHARED ITERATOR*/ if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; i = p - s - 1; if (i < 0 || p[-1] != ':') { /* Didn't find ":]", so treat like a normal set. */ p = s - 2; p_ch = '['; if (t_ch == p_ch) - matched = TRUE; + matched = 1; continue; } if (CC_EQ(s,i, "alnum")) { if (ISALNUM(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "alpha")) { if (ISALPHA(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "blank")) { if (ISBLANK(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "cntrl")) { if (ISCNTRL(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "digit")) { if (ISDIGIT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "graph")) { if (ISGRAPH(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "lower")) { if (ISLOWER(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "print")) { if (ISPRINT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "punct")) { if (ISPUNCT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "space")) { if (ISSPACE(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "upper")) { if (ISUPPER(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "xdigit")) { if (ISXDIGIT(t_ch)) - matched = TRUE; + matched = 1; } else /* malformed [:class:] string */ - return ABORT_ALL; + return WM_ABORT_ALL; p_ch = 0; /* This makes "prev_ch" get set to 0. */ } else if (t_ch == p_ch) - matched = TRUE; + matched = 1; } while (prev_ch = p_ch, (p_ch = *++p) != ']'); if (matched == negated || t_ch == '/') - return NOMATCH; + return WM_NOMATCH; continue; } } - return *text ? NOMATCH : MATCH; + return *text ? WM_NOMATCH : WM_MATCH; } /* Match the "pattern" against the "text" string. */ -int wildmatch(const char *pattern, const char *text, int flags) +int wildmatch(const char *pattern, const char *text, + unsigned int flags, struct wildopts *wo) { return dowild((const uchar*)pattern, (const uchar*)text, - flags & FNM_CASEFOLD ? 1 :0); + flags & WM_CASEFOLD ? 1 :0); } |