Fix a parameter switch typo in the linux code.
[xonotic/darkplaces.git] / filematch.c
index ff24347..622f774 100644 (file)
@@ -3,15 +3,17 @@
 
 // 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)
        {
                switch (*pattern)
                {
+               case 0:
+                       return 1; // end of pattern
                case '?': // match any single character
-                       if (!*in)
+                       if (*in == 0 || *in == '/' || *in == '\\' || *in == ':')
                                return 0; // no match
                        in++;
                        pattern++;
@@ -19,23 +21,16 @@ int matchpattern(char *in, char *pattern, int caseinsensitive)
                case '*': // match anything until following string
                        if (!*in)
                                return 1; // match
-                       while (*pattern == '*')
-                               pattern++;
-                       if (*pattern == '?')
-                       {
-                               // *? (weird)
-                               break;
-                       }
-                       else if (*pattern)
-                       {
-                               // *text (typical)
-                               while (*in && *in != *pattern)
-                                       in++;
-                       }
-                       else
+                       pattern++;
+                       while (*in)
                        {
-                               // *null (* at end of pattern)
-                               return 1;
+                               if (*in == '/' || *in == '\\' || *in == ':')
+                                       break;
+                               // see if pattern matches at this offset
+                               if (matchpattern(in, pattern, caseinsensitive))
+                                       return 1;
+                               // nope, advance to next offset
+                               in++;
                        }
                        break;
                default:
@@ -62,126 +57,118 @@ int matchpattern(char *in, char *pattern, int caseinsensitive)
        return 1; // success
 }
 
-// a little chained strings system
-stringlist_t *stringlistappend(stringlist_t *current, char *text)
+// a little strings system
+void stringlistinit(stringlist_t *list)
 {
-       stringlist_t *newitem;
-       newitem = Z_Malloc(strlen(text) + 1 + sizeof(stringlist_t));
-       newitem->next = NULL;
-       newitem->text = (char *)(newitem + 1);
-       strcpy(newitem->text, text);
-       if (current)
-               current->next = newitem;
-       return newitem;
+       memset(list, 0, sizeof(*list));
 }
 
-void stringlistfree(stringlist_t *current)
+void stringlistfreecontents(stringlist_t *list)
 {
-       stringlist_t *next;
-       while (current)
+       int i;
+       for (i = 0;i < list->numstrings;i++)
+       {
+               if (list->strings[i])
+                       Z_Free(list->strings[i]);
+               list->strings[i] = NULL;
+       }
+       list->numstrings = 0;
+       list->maxstrings = 0;
+       if (list->strings)
+               Z_Free(list->strings);
+       list->strings = NULL;
+}
+
+void stringlistappend(stringlist_t *list, const char *text)
+{
+       size_t textlen;
+       char **oldstrings;
+
+       if (list->numstrings >= list->maxstrings)
        {
-               next = current->next;
-               Z_Free(current);
-               current = next;
+               oldstrings = list->strings;
+               list->maxstrings += 4096;
+               list->strings = 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);
+       memcpy(list->strings[list->numstrings], text, textlen);
+       list->numstrings++;
 }
 
-stringlist_t *stringlistsort(stringlist_t *start)
+void stringlistsort(stringlist_t *list)
 {
-       int notdone;
-       stringlist_t *current, *previous, *temp2, *temp3, *temp4;
-       notdone = 1;
-       while (notdone)
+       int i, j;
+       char *temp;
+       // this is a selection sort (finds the best entry for each slot)
+       for (i = 0;i < list->numstrings - 1;i++)
        {
-               current = start;
-               notdone = 0;
-               previous = NULL;
-               while (current && current->next)
+               for (j = i + 1;j < list->numstrings;j++)
                {
-                       if (strcmp(current->text, current->next->text) > 0)
+                       if (strcasecmp(list->strings[i], list->strings[j]) > 0)
                        {
-                               // current is greater than next
-                               notdone = 1;
-                               temp2 = current->next;
-                               temp3 = current;
-                               temp4 = current->next->next;
-                               if (previous)
-                                       previous->next = temp2;
-                               else
-                                       start = temp2;
-                               temp2->next = temp3;
-                               temp3->next = temp4;
-                               break;
+                               temp = list->strings[i];
+                               list->strings[i] = list->strings[j];
+                               list->strings[j] = temp;
                        }
-                       previous = current;
-                       current = current->next;
                }
        }
-       return start;
 }
 
 // operating system specific code
+static void adddirentry(stringlist_t *list, const char *path, const char *name)
+{
+       if (strcmp(name, ".") && strcmp(name, ".."))
+       {
+               char temp[MAX_OSPATH];
+               dpsnprintf( temp, sizeof( temp ), "%s%s", path, name );
+               stringlistappend(list, temp);
+       }
+}
 #ifdef WIN32
 #include <io.h>
-stringlist_t *listdirectory(char *path)
+void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 {
+       int i;
        char pattern[4096], *c;
        struct _finddata_t n_file;
-    long hFile;
-       stringlist_t *start, *current;
-       strcpy(pattern, path);
-       strcat(pattern, "\\*");
+       long hFile;
+       strlcpy (pattern, basepath, sizeof(pattern));
+       strlcat (pattern, path, sizeof (pattern));
+       strlcat (pattern, "*", sizeof (pattern));
        // ask for the directory listing handle
        hFile = _findfirst(pattern, &n_file);
-       if(hFile != -1)
-       {
-               // start a new chain with the the first name
-               start = current = stringlistappend(NULL, n_file.name);
-               // iterate through the directory
-               while (_findnext(hFile, &n_file) == 0)
-                       current = stringlistappend(current, n_file.name);
-               _findclose(hFile);
-
-               // convert names to lowercase because windows does not care, but pattern matching code often does
-               for (current = start;current;current = current->next)
-                       for (c = current->text;*c;c++)
-                               if (*c >= 'A' && *c <= 'Z')
-                                       *c += 'a' - 'A';
+       if(hFile == -1)
+               return;
+       do {
+               adddirentry(list, path, n_file.name );
+       } while (_findnext(hFile, &n_file) == 0);
+       _findclose(hFile);
 
-               // sort the list alphanumerically
-               start = stringlistsort(start);
-               return start;
-       }
-       else
-               return NULL;
+       // convert names to lowercase because windows does not care, but pattern matching code often does
+       for (i = 0;i < list->numstrings;i++)
+               for (c = list->strings[i];*c;c++)
+                       if (*c >= 'A' && *c <= 'Z')
+                               *c += 'a' - 'A';
 }
 #else
 #include <dirent.h>
-stringlist_t *listdirectory(char *path)
+void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 {
+       char fullpath[MAX_OSPATH];
        DIR *dir;
        struct dirent *ent;
-       stringlist_t *start, *current;
-       dir = opendir(path);
+       dpsnprintf(fullpath, sizeof(fullpath), "%s%s", basepath, *path ? path : "./");
+       dir = opendir(fullpath);
        if (!dir)
-               return NULL;
-       ent = readdir(dir);
-       if (!ent)
-       {
-               closedir(dir);
-               return NULL;
-       }
-       start = current = stringlistappend(NULL, ent->d_name);
-       while((ent = readdir(dir)))
-               current = stringlistappend(current, ent->d_name);
+               return;
+       while ((ent = readdir(dir)))
+               adddirentry(list, path, ent->d_name);
        closedir(dir);
-       // sort the list alphanumerically
-       return stringlistsort(start);
 }
 #endif
 
-void freedirectory(stringlist_t *list)
-{
-       stringlistfree(list);
-}
-