make DP compile with C++ again

[xonotic/darkplaces.git] / filematch.c

diff --git a/filematch.c b/filematch.c
index 622f774bc204fdcf680a6c066c485e77781f389f..0755f14aaa2ea61641504feda50560710c6b6ee3 100644 (file)
--- a/filematch.c
+++ b/filematch.c
@@ -4,6 +4,11 @@
 // LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
 
 int matchpattern(const char *in, const char *pattern, int caseinsensitive)
+{
+       return matchpattern_with_separator(in, pattern, caseinsensitive, "/\\:", false);
+}
+
+int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one)
 {
        int c1, c2;
        while (*pattern)
@@ -13,18 +18,21 @@ int matchpattern(const char *in, const char *pattern, int caseinsensitive)
                case 0:
                        return 1; // end of pattern
                case '?': // match any single character
-                       if (*in == 0 || *in == '/' || *in == '\\' || *in == ':')
+                       if (*in == 0 || strchr(separators, *in))
                                return 0; // no match
                        in++;
                        pattern++;
                        break;
                case '*': // match anything until following string
+                       if(wildcard_least_one)
+                               if (*in == 0 || strchr(separators, *in))
+                                       return 0; // no match
                        if (!*in)
                                return 1; // match
                        pattern++;
                        while (*in)
                        {
-                               if (*in == '/' || *in == '\\' || *in == ':')
+                               if (strchr(separators, *in))
                                        break;
                                // see if pattern matches at this offset
                                if (matchpattern(in, pattern, caseinsensitive))
@@ -88,14 +96,14 @@ void stringlistappend(stringlist_t *list, const char *text)
        {
                oldstrings = list->strings;
                list->maxstrings += 4096;
-               list->strings = Z_Malloc(list->maxstrings * sizeof(*list->strings));
+               list->strings = (char **) Z_Malloc(list->maxstrings * sizeof(*list->strings));
                if (list->numstrings)
                        memcpy(list->strings, oldstrings, list->numstrings * sizeof(*list->strings));
                if (oldstrings)
                        Z_Free(oldstrings);
        }
        textlen = strlen(text) + 1;
-       list->strings[list->numstrings] = Z_Malloc(textlen);
+       list->strings[list->numstrings] = (char *) Z_Malloc(textlen);
        memcpy(list->strings[list->numstrings], text, textlen);
        list->numstrings++;
 }