Bring back ToLowerCase hack, as it covers cases with directories and subdirectories. But make it more safe!

Author: a1batross

engine/common/build.c

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 #define XASH_GENERATE_BUILDNUM
 
 #if defined(XASH_GENERATE_BUILDNUM)
-static char *date = __DATE__ ;
+static char *date = __DATE__;
 static char *mon[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 static char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 #endif

engine/common/common.h

@@ -459,7 +459,6 @@ int matchpattern( const char *in, const char *pattern, qboolean caseinsensitive
 int matchpattern_with_separator( const char *in, const char *pattern, qboolean caseinsensitive, const char *separators, qboolean wildcard_least_one );
 void FS_Init( void );
 void FS_Path( void );
-char *FS_ToLowerCase( const char *path );
 void FS_Shutdown( void );
 void FS_ClearSearchPath( void );
 void FS_AllowDirectPaths( qboolean enable );

engine/common/filesystem.c

@@ -1984,20 +1984,21 @@ FS_ToLowerCase
 Function to set all characters of path lowercase
 ====================
 */
-char* FS_ToLowerCase( const char* path )
+static char* FS_ToLowerCase( const char* path )
 {
-	if (path) {
-		char *result = malloc(strlen(path) + 1);
-		int i = 0;
-		while( path[i] )
-		{
-			result[i] = tolower( path[i] );
-			++i;
-		}
-		result[i] = '\0';
-		return result;
+	static char path2[MAX_SYSPATH];
+	int i;
+
+	ASSERT( path );
+
+	for( i = 0; path[i]; i++ )
+	{
+		path2[i] = Q_tolower( path[i] );
 	}
-	return NULL;
+
+	path2[i] = 0;
+
+	return path2;
 }
 
 /*
@@ -2753,22 +2754,23 @@ byte *FS_LoadFile( const char *path, fs_offset_t *filesizeptr, qboolean gamediro
 
 	file = FS_Open( path, "rb", gamedironly );
 
+#ifndef _WIN32
 	if( !file )
 	{
 		// Try to open this file with lowered path
-		char *loweredPath = FS_ToLowerCase( path );
-		file = FS_Open( loweredPath, "rb", gamedironly );
-		free(loweredPath);
-		if( !file )
-		{
-			// Now it truly doesn't exist in file system
-			buf = W_LoadFile( path, &filesize, gamedironly );
+		file = FS_Open( FS_ToLowerCase( path ), "rb", gamedironly );
+	}
+#endif // _WIN32
+
+	if( !file )
+	{
+		// Now it truly doesn't exist in file system
+		buf = W_LoadFile( path, &filesize, gamedironly );
 
-			if( filesizeptr )
-				*filesizeptr = filesize;
+		if( filesizeptr )
+			*filesizeptr = filesize;
 
-			return buf;
-		}
+		return buf;
 	}
 
 	// Try to load
@@ -2800,17 +2802,17 @@ byte *FS_LoadDirectFile( const char *path, fs_offset_t *filesizeptr )
 
 	file = FS_SysOpen( path, "rb" );
 
+#ifndef _WIN32
 	if( !file )
 	{
 		// Try to open this file with lowered path
-		char *loweredPath = FS_ToLowerCase( path );
-		file = FS_SysOpen( loweredPath, "rb" );
-		free(loweredPath);
-		if( !file )
-		{
-			return NULL;
-		}
+		file = FS_SysOpen( FS_ToLowerCase( path ), "rb" );
 	}
+#endif // _WIN32
+
+	if( !file )
+		return NULL;
+
 
 	// Try to load
 	filesize = file->real_length;
@@ -2836,12 +2838,10 @@ file_t *FS_OpenFile( const char *path, fs_offset_t *filesizeptr, qboolean gamedi
 {
 	file_t	*file = FS_Open( path, "rb", gamedironly );
 
+#ifndef _WIN32
 	if( !file )
-	{
-		char *loweredPath = FS_ToLowerCase( path );
-		file = FS_Open( loweredPath, "rb", gamedironly );
-		free(loweredPath);
-	}
+		file = FS_Open( FS_ToLowerCase( path ), "rb", gamedironly );
+#endif // _WIN32
 
 	if( filesizeptr )
 	{