X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=filematch.c;h=54bd2a5c50f13d86bef459c47ed0816a0bb5d84e;hp=622f774bc204fdcf680a6c066c485e77781f389f;hb=bc9063582a5b12986a3f70b4eaa9ffaf1568f735;hpb=32b19c82a6a8550d6ab088ed06263a1ad9516712

diff --git a/filematch.c b/filematch.c
index 622f774b..54bd2a5c 100644
--- a/filematch.c
+++ b/filematch.c
@@ -4,6 +4,11 @@
 // 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);
+}
+
+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 +18,24 @@ 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(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))
+				if (matchpattern_with_separator(in, pattern, caseinsensitive, separators, wildcard_least_one))
 					return 1;
 				// nope, advance to next offset
 				in++;
@@ -88,14 +96,14 @@ void stringlistappend(stringlist_t *list, const 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++;
 }
@@ -130,24 +138,24 @@ static void adddirentry(stringlist_t *list, const char *path, const char *name)
 	}
 }
 #ifdef WIN32
-#include <io.h>
+#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;
+	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;
 	do {
-		adddirentry(list, path, n_file.name );
-	} while (_findnext(hFile, &n_file) == 0);
-	_findclose(hFile);
+		adddirentry(list, path, n_file.cFileName);
+	} while (FindNextFile(hFile, &n_file) != 0);
+	FindClose(hFile);
 
 	// convert names to lowercase because windows does not care, but pattern matching code often does
 	for (i = 0;i < list->numstrings;i++)