X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c9a59880f0ddf58c700834fea80c08c39c27ccb3..97d53f8c757d30584232e986cad3fa05b9f570f6:/lib/wildmatch.c

diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index 9276954c..35b65009 100644
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -12,21 +12,53 @@
 #include "rsync.h"
 
 /* What character marks an inverted character class? */
-#define NEGATE_CLASS '!'
+#define NEGATE_CLASS	'!'
+#define NEGATE_CLASS2	'^'
 
 #define FALSE 0
 #define TRUE 1
 #define ABORT_ALL -1
 #define ABORT_TO_STARSTAR -2
 
+#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 && strncmp(class, litmatch, len) == 0)
+
+#if defined STDC_HEADERS || !defined isascii
+# define ISASCII(c) 1
+#else
+# define ISASCII(c) isascii(c)
+#endif
+
+#ifdef isblank
+# define ISBLANK(c) (ISASCII(c) && isblank(c))
+#else
+# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
+#endif
+
+#ifdef isgraph
+# define ISGRAPH(c) (ISASCII(c) && isgraph(c))
+#else
+# define ISGRAPH(c) (ISASCII(c) && isprint(c) && !isspace(c))
+#endif
+
+#define ISPRINT(c) (ISASCII(c) && isprint(c))
+#define ISDIGIT(c) (ISASCII(c) && isdigit(c))
+#define ISALNUM(c) (ISASCII(c) && isalnum(c))
+#define ISALPHA(c) (ISASCII(c) && isalpha(c))
+#define ISCNTRL(c) (ISASCII(c) && iscntrl(c))
+#define ISLOWER(c) (ISASCII(c) && islower(c))
+#define ISPUNCT(c) (ISASCII(c) && ispunct(c))
+#define ISSPACE(c) (ISASCII(c) && isspace(c))
+#define ISUPPER(c) (ISASCII(c) && isupper(c))
+#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
+
 #ifdef WILD_TEST_ITERATIONS
 int wildmatch_iteration_count;
 #endif
 
-static int domatch(const char *p, const char *text)
+static int domatch(const unsigned char *p, const unsigned char *text)
 {
     int matched, special;
-    char ch, prev;
+    unsigned char ch, prev;
 
 #ifdef WILD_TEST_ITERATIONS
     wildmatch_iteration_count++;
@@ -73,6 +105,10 @@ static int domatch(const char *p, const char *text)
 	    return ABORT_ALL;
 	  case '[':
 	    ch = *++p;
+#ifdef NEGATE_CLASS2
+	    if (ch == NEGATE_CLASS2)
+		ch = NEGATE_CLASS;
+#endif
 	    /* Assign literal TRUE/FALSE because of "matched" comparison. */
 	    special = ch == NEGATE_CLASS? TRUE : FALSE;
 	    if (special) {
@@ -84,9 +120,46 @@ static int domatch(const char *p, const char *text)
 	    do {
 		if (!ch)
 		    return FALSE;
-		if (ch == '-' && prev && p[1] && p[1] != ']') {
-		    if (*text <= *++p && *text >= prev)
+		if (ch == '\\') {
+		    ch = *++p;
+		    if (!ch)
+			return FALSE;
+		    if (*text == ch)
+			matched = TRUE;
+		}
+		else if (ch == '-' && prev && p[1] && p[1] != ']') {
+		    ch = *++p;
+		    if (ch == '\\') {
+			ch = *++p;
+			if (!ch)
+			    return FALSE;
+		    }
+		    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;
+		    int i;
+		    while ((ch = *p) && (ch != ':' || p[1] != ']')) 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++;
 		    ch = 0; /* This makes "prev" get set to 0. */
 		}
 		else if (*text == ch)
@@ -101,10 +174,11 @@ static int domatch(const char *p, const char *text)
     return *text == '\0';
 }
 
-int wildmatch(const char *p, const char *text)
+/* Find the pattern (p) in the text string (t). */
+int wildmatch(const char *p, const char *t)
 {
 #ifdef WILD_TEST_ITERATIONS
     wildmatch_iteration_count = 0;
 #endif
-    return domatch(p, text) == TRUE;
+    return domatch((const unsigned char*)p, (const unsigned char*)t) == TRUE;
 }