Fixed a bug in strlcat() where it would not properly detect a no-change

[rsync/rsync.git] / lib / wildmatch.c

diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index fa6b1a3..8de33c3 100644 (file)
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -20,7 +20,38 @@
 #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
+#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;
@@ -63,7 +94,7 @@ static int domatch(const unsigned char *p, const unsigned char *text)
            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) {
@@ -90,11 +121,11 @@ static int domatch(const unsigned char *p, const unsigned char *text)
            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;
                }
@@ -103,40 +134,83 @@ static int domatch(const unsigned char *p, const unsigned char *text)
                    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 unsigned char *s = p += 2;
                    int i;
-                   while ((ch = *p) && (ch != ':' || p[1] != ']')) p++;
+                   while ((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;
        }