]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix a filesystem directory listing bug in FS_Search
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 16 Dec 2003 15:59:21 +0000 (15:59 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 16 Dec 2003 15:59:21 +0000 (15:59 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3736 d7cf8633-e32d-0410-b094-e92efae38249

fs.c

diff --git a/fs.c b/fs.c
index 3143e7badb681d6c5f9be81ea5771e0df151c073..beddbec613a68da96bce9139c73cf90d81b0cb7c 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1939,8 +1939,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
                        {
                                for (dirfile = dir;dirfile;dirfile = dirfile->next)
                                {
-                                       memcpy(temp, basepath, basepathlength);
-                                       strcpy(temp + basepathlength, dirfile->text);
+                                       snprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text);
                                        if (matchpattern(temp, (char *)pattern, true))
                                        {
                                                for (listtemp = liststart;listtemp;listtemp = listtemp->next)