X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=filematch.c;h=e4a81fdbc23942df27e3398feeccb65f86035fdc;hb=511c0afa8e95fb7dca7017db29b91ff37b72f4be;hp=996753c1281240cf17e9bce3cf3cd494b65bf269;hpb=5d6fabe47d4cce45d956fdfa4d4dba30e2f6ea06;p=xonotic%2Fdarkplaces.git

diff --git a/filematch.c b/filematch.c
index 996753c1..e4a81fdb 100644
--- a/filematch.c
+++ b/filematch.c
@@ -3,14 +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 matchpattern(char *in, 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++;
@@ -18,28 +21,32 @@ int matchpattern(char *in, char *pattern)
 		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:
 			if (*in != *pattern)
-				return 0; // no match
+			{
+				if (!caseinsensitive)
+					return 0; // no match
+				c1 = *in;
+				if (c1 >= 'A' && c1 <= 'Z')
+					c1 += 'a' - 'A';
+				c2 = *pattern;
+				if (c2 >= 'A' && c2 <= 'Z')
+					c2 += 'a' - 'A';
+				if (c1 != c2)
+					return 0; // no match
+			}
 			in++;
 			pattern++;
 			break;
@@ -113,12 +120,12 @@ stringlist_t *stringlistsort(stringlist_t *start)
 #include <io.h>
 stringlist_t *listdirectory(char *path)
 {
-	char pattern[4096];
+	char pattern[4096], *c;
 	struct _finddata_t n_file;
     long hFile;
 	stringlist_t *start, *current;
-	strcpy(pattern, path);
-	strcat(pattern, "\\*");
+	strlcpy (pattern, path, sizeof (pattern));
+	strlcat (pattern, "\\*", sizeof (pattern));
 	// ask for the directory listing handle
 	hFile = _findfirst(pattern, &n_file);
 	if(hFile != -1)
@@ -129,8 +136,16 @@ stringlist_t *listdirectory(char *path)
 		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';
+
 		// sort the list alphanumerically
-		return stringlistsort(start);
+		start = stringlistsort(start);
+		return start;
 	}
 	else
 		return NULL;
@@ -163,4 +178,5 @@ stringlist_t *listdirectory(char *path)
 void freedirectory(stringlist_t *list)
 {
 	stringlistfree(list);
-}
\ No newline at end of file
+}
+