added vid_grabkeyboard cvar which defaults to 0, this means that the glx client no...

[xonotic/darkplaces.git] / filematch.c

diff --git a/filematch.c b/filematch.c
index 758575f2e8329d4369e8be1449678ff9a95837bf..0837136f7e36bcea5d6d8821a5bec224d58070ef 100644 (file)
--- a/filematch.c
+++ b/filematch.c
@@ -3,7 +3,7 @@
 
 // LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
 
-int matchpattern(char *in, char *pattern, int caseinsensitive)
+int matchpattern(const char *in, const char *pattern, int caseinsensitive)
 {
        int c1, c2;
        while (*pattern)
@@ -61,10 +61,13 @@ int matchpattern(char *in, char *pattern, int caseinsensitive)
 stringlist_t *stringlistappend(stringlist_t *current, char *text)
 {
        stringlist_t *newitem;
-       newitem = Z_Malloc(strlen(text) + 1 + sizeof(stringlist_t));
+       size_t textlen;
+
+       textlen = strlen(text) + 1;
+       newitem = (stringlist_t *)Z_Malloc(textlen + sizeof(stringlist_t));
        newitem->next = NULL;
        newitem->text = (char *)(newitem + 1);
-       strcpy(newitem->text, text);
+       memcpy(newitem->text, text, textlen);
        if (current)
                current->next = newitem;
        return newitem;