X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=filematch.c;h=f6d85790d0d5baffe90f7f2f5c5c1eab68708281;hb=50c4b3ff9165438604c2cba22dd9636043ebc5d6;hp=e4a81fdbc23942df27e3398feeccb65f86035fdc;hpb=4d4b99bc56915c31fdd88790ac329d125a75a308;p=xonotic%2Fdarkplaces.git

diff --git a/filematch.c b/filematch.c
index e4a81fdb..f6d85790 100644
--- a/filematch.c
+++ b/filematch.c
@@ -3,7 +3,7 @@
 
 // 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)
@@ -61,7 +61,7 @@ int matchpattern(char *in, char *pattern, int caseinsensitive)
 stringlist_t *stringlistappend(stringlist_t *current, char *text)
 {
 	stringlist_t *newitem;
-	newitem = Z_Malloc(strlen(text) + 1 + sizeof(stringlist_t));
+	newitem = (stringlist_t *)Z_Malloc(strlen(text) + 1 + sizeof(stringlist_t));
 	newitem->next = NULL;
 	newitem->text = (char *)(newitem + 1);
 	strcpy(newitem->text, text);
@@ -85,6 +85,9 @@ stringlist_t *stringlistsort(stringlist_t *start)
 {
 	int notdone;
 	stringlist_t *current, *previous, *temp2, *temp3, *temp4;
+	// exit early if there's nothing to sort
+	if (start == NULL || start->next == NULL)
+		return start;
 	notdone = 1;
 	while (notdone)
 	{
@@ -118,41 +121,37 @@ stringlist_t *stringlistsort(stringlist_t *start)
 // operating system specific code
 #ifdef WIN32
 #include <io.h>
-stringlist_t *listdirectory(char *path)
+stringlist_t *listdirectory(const char *path)
 {
 	char pattern[4096], *c;
 	struct _finddata_t n_file;
-    long hFile;
+	long hFile;
 	stringlist_t *start, *current;
 	strlcpy (pattern, path, sizeof (pattern));
-	strlcat (pattern, "\\*", 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);
+	if(hFile == -1)
+		return NULL;
+	// 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';
+	// 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
-		start = stringlistsort(start);
-		return start;
-	}
-	else
-		return NULL;
+	// sort the list alphanumerically
+	return stringlistsort(start);
 }
 #else
 #include <dirent.h>
-stringlist_t *listdirectory(char *path)
+stringlist_t *listdirectory(const char *path)
 {
 	DIR *dir;
 	struct dirent *ent;
@@ -160,15 +159,16 @@ stringlist_t *listdirectory(char *path)
 	dir = opendir(path);
 	if (!dir)
 		return NULL;
-	ent = readdir(dir);
-	if (!ent)
+	start = current = NULL;
+	while ((ent = readdir(dir)))
 	{
-		closedir(dir);
-		return NULL;
+		if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, ".."))
+		{
+			current = stringlistappend(current, ent->d_name);
+			if (!start)
+				start = current;
+		}
 	}
-	start = current = stringlistappend(NULL, ent->d_name);
-	while((ent = readdir(dir)))
-		current = stringlistappend(current, ent->d_name);
 	closedir(dir);
 	// sort the list alphanumerically
 	return stringlistsort(start);