X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=filematch.c;h=c88c704e309057386b673d4221a8bc815f6f6e97;hb=9a48353dc19ae3bf696fabbfa0388e200fb5acfc;hp=a4f670f9732b5b906a9e227be050bb6712d1765a;hpb=5f287be4a74858793ea36ca8144e2b1720d99d9f;p=xonotic%2Fdarkplaces.git

diff --git a/filematch.c b/filematch.c
index a4f670f9..c88c704e 100644
--- a/filematch.c
+++ b/filematch.c
@@ -3,7 +3,12 @@
 
 // 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)
+{
+	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(char *in, 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))
@@ -57,126 +65,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++)
 	{
-		next = current->next;
-		Z_Free(current);
-		current = next;
+		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;
 }
 
-stringlist_t *stringlistsort(stringlist_t *start)
+void stringlistappend(stringlist_t *list, const char *text)
 {
-	int notdone;
-	stringlist_t *current, *previous, *temp2, *temp3, *temp4;
-	notdone = 1;
-	while (notdone)
+	size_t textlen;
+	char **oldstrings;
+
+	if (list->numstrings >= list->maxstrings)
 	{
-		current = start;
-		notdone = 0;
-		previous = NULL;
-		while (current && current->next)
+		oldstrings = list->strings;
+		list->maxstrings += 4096;
+		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] = (char *) Z_Malloc(textlen);
+	memcpy(list->strings[list->numstrings], text, textlen);
+	list->numstrings++;
+}
+
+void stringlistsort(stringlist_t *list)
+{
+	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++)
+	{
+		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(const char *path)
+#include <windows.h>
+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;
-	strlcpy (pattern, path, sizeof (pattern));
-	strlcat (pattern, "\\*", sizeof (pattern));
+	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)
-	{
-		// 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';
+	hFile = FindFirstFile(pattern, &n_file);
+	if(hFile == INVALID_HANDLE_VALUE)
+		return;
+	do {
+		adddirentry(list, path, n_file.cFileName);
+	} while (FindNextFile(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(const 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);
-}
-