X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=filematch.c;h=14c1d1605ab43d77616f2577d7a5ade11549673f;hp=f75ba870b7fc986cec876acd31abea40b99bc9aa;hb=19487ef2ebada39fb6a6a372b30ca4f66bb78ada;hpb=e2d477a56a27463c71dc912f29965c671b583c59;ds=sidebyside diff --git a/filematch.c b/filematch.c index f75ba870..14c1d160 100644 --- a/filematch.c +++ b/filematch.c @@ -1,9 +1,22 @@ +#ifdef WIN32 +#include +#else +#include +#endif + #include "quakedef.h" // 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); +} + +// wildcard_least_one: if true * matches 1 or more characters +// if false * matches 0 or more characters +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,21 +26,25 @@ 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 (!*in) - return 1; // match + if(wildcard_least_one) + { + if (*in == 0 || strchr(separators, *in)) + return 0; // no match + in++; + } pattern++; while (*in) { - if (*in == '/' || *in == '\\' || *in == ':') + if (strchr(separators, *in)) break; // see if pattern matches at this offset - if (matchpattern(in, pattern, caseinsensitive)) + if (matchpattern_with_separator(in, pattern, caseinsensitive, separators, wildcard_least_one)) return 1; // nope, advance to next offset in++; @@ -76,9 +93,10 @@ void stringlistfreecontents(stringlist_t *list) list->maxstrings = 0; if (list->strings) Z_Free(list->strings); + list->strings = NULL; } -void stringlistappend(stringlist_t *list, char *text) +void stringlistappend(stringlist_t *list, const char *text) { size_t textlen; char **oldstrings; @@ -87,77 +105,118 @@ void stringlistappend(stringlist_t *list, 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++; } -void stringlistsort(stringlist_t *list) +static int stringlistsort_cmp(const void *a, const void *b) +{ + return strcasecmp(*(const char **)a, *(const char **)b); +} + +void stringlistsort(stringlist_t *list, qboolean uniq) { 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++) + if(list->numstrings < 1) + return; + qsort(&list->strings[0], list->numstrings, sizeof(list->strings[0]), stringlistsort_cmp); + if(uniq) { - for (j = i + 1;j < list->numstrings;j++) + // i: the item to read + // j: the item last written + for (i = 1, j = 0; i < list->numstrings; ++i) { - if (strcmp(list->strings[i], list->strings[j]) > 0) - { - temp = list->strings[i]; - list->strings[i] = list->strings[j]; - list->strings[j] = temp; - } + char *save; + if(!strcasecmp(list->strings[i], list->strings[j])) + continue; + ++j; + save = list->strings[j]; + list->strings[j] = list->strings[i]; + list->strings[i] = save; } + for(i = j+1; i < list->numstrings; ++i) + { + if (list->strings[i]) + Z_Free(list->strings[i]); + } + list->numstrings = j+1; } } // 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 -void listdirectory(stringlist_t *list, const 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; - strlcpy (pattern, path, sizeof (pattern)); + char pattern[4096]; + WIN32_FIND_DATA n_file; + HANDLE 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) + hFile = FindFirstFile(pattern, &n_file); + if(hFile == INVALID_HANDLE_VALUE) return; - // start a new chain with the the first name - stringlistappend(list, n_file.name); - // iterate through the directory - while (_findnext(hFile, &n_file) == 0) - stringlistappend(list, n_file.name); - _findclose(hFile); - - // 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'; + do { + adddirentry(list, path, n_file.cFileName); + } while (FindNextFile(hFile, &n_file) != 0); + FindClose(hFile); } #else -#include -void listdirectory(stringlist_t *list, const char *path) +void listdirectory(stringlist_t *list, const char *basepath, const char *path) { + char fullpath[MAX_OSPATH]; DIR *dir; struct dirent *ent; - dir = opendir(path); + dpsnprintf(fullpath, sizeof(fullpath), "%s%s", basepath, path); +#ifdef __ANDROID__ + // SDL currently does not support listing assets, so we have to emulate + // it. We're using relative paths for assets, so that will do. + if (basepath[0] != '/') + { + char listpath[MAX_OSPATH]; + qfile_t *listfile; + dpsnprintf(listpath, sizeof(listpath), "%sls.txt", fullpath); + char *buf = (char *) FS_SysLoadFile(listpath, tempmempool, true, NULL); + if (!buf) + return; + char *p = buf; + for (;;) + { + char *q = strchr(p, '\n'); + if (q == NULL) + break; + *q = 0; + adddirentry(list, path, p); + p = q + 1; + } + Mem_Free(buf); + return; + } +#endif + dir = opendir(fullpath); if (!dir) return; + while ((ent = readdir(dir))) - if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) - stringlistappend(list, ent->d_name); + adddirentry(list, path, ent->d_name); closedir(dir); } #endif