1 files changed, 22 insertions, 21 deletions

diff --git a/src/skel/crossplatform.cpp b/src/skel/crossplatform.cpp
index ac4bbe85..f2f9d5ee 100644
--- a/src/skel/crossplatform.cpp
+++ b/src/skel/crossplatform.cpp
@@ -26,34 +26,35 @@ void GetLocalTime_CP(SYSTEMTIME *out) {
 // Compatible with Linux/POSIX and MinGW on Windows
 #ifndef _WIN32
 HANDLE FindFirstFile(const char* pathname, WIN32_FIND_DATA* firstfile) {
-	char newpathname[32];
-	
-	strncpy(newpathname, pathname, 32);
-	char* path = strtok(newpathname, "*");
+	char pathCopy[MAX_PATH];
+	strcpy(pathCopy, pathname);
+
+	char *folder = strtok(pathCopy, "*");
+	char *extension = strtok(NULL, "*");
+
+	// because strtok doesn't return NULL for last delimiter
+	if (extension - folder == strlen(pathname))
+		extension = nil;
 	
 	// Case-sensitivity and backslashes...
-	char *real = casepath(path);
-	if (real) {
-		real[strlen(real)] = '*';
-		char *extension = strtok(NULL, "*");
-		if (extension)
-			strcat(real, extension);
-		
-		strncpy(newpathname, real, 32);
-		free(real);
-		path = strtok(newpathname, "*");
+	// Will be freed at the bottom
+	char *realFolder = casepath(folder);
+	if (realFolder) {
+		folder = realFolder;
 	}
-	
-	strncpy(firstfile->folder, path, sizeof(firstfile->folder));
 
-	// Both w/ extension and w/o extension is ok
-	if (strlen(path) + 1 != strlen(pathname))
-		strncpy(firstfile->extension, strtok(NULL, "*"), sizeof(firstfile->extension));
+	strncpy(firstfile->folder, folder, sizeof(firstfile->folder));
+
+	if (extension)
+		strncpy(firstfile->extension, extension, sizeof(firstfile->extension));
 	else
-		strncpy(firstfile->extension, "", sizeof(firstfile->extension));
+		firstfile->extension[0] = '\0';
+
+	if (realFolder)
+		free(realFolder);
 
 	HANDLE d;
-	if ((d = (HANDLE)opendir(path)) == NULL || !FindNextFile(d, firstfile))
+	if ((d = (HANDLE)opendir(firstfile->folder)) == NULL || !FindNextFile(d, firstfile))
 		return NULL;
 
 	return d;