Linux: move filecase to TCFoundation

Author: pbartfai

BuildPartsCatalog/PartsCatalog.cpp

@@ -21,7 +21,7 @@
 #include <LDLoader/LDLError.h>
 
 #if !defined (WIN32) && !defined (__APPLE__)
-#include "filecase.h"
+#include <TCFoundation/filecase.h>
 #endif
 
 namespace fs = std::filesystem;

OSMesa/ldview.cpp

@@ -26,6 +26,7 @@
 #include <TRE/TREMainModel.h>
 #include "StudLogo.h"
 #include "LDViewMessages.h"
+#include <TCFoundation/filecase.h>
 
 typedef std::map<std::string, std::string> StringMap;
 
@@ -138,129 +139,6 @@ void *setupContext(OSMesaContext &ctx)
 }
 #endif
 
-bool dirExists(const std::string &path)
-{
-	struct stat buf;
-	if (stat(path.c_str(), &buf) != 0)
-	{
-		return false;
-	}
-	return S_ISDIR(buf.st_mode);
-}
-
-bool fileOrDirExists(const std::string &path)
-{
-	struct stat buf;
-	if (stat(path.c_str(), &buf) != 0)
-	{
-		return false;
-	}
-	return S_ISREG(buf.st_mode) || S_ISDIR(buf.st_mode);
-}
-
-bool findDirEntry(std::string &path)
-{
-	size_t lastSlash = path.rfind('/');
-	if (lastSlash >= path.size())
-	{
-		return false;
-	}
-	std::string dirName = path.substr(0, lastSlash);
-	std::string lowerFilename = lowerCaseString(path.substr(lastSlash + 1));
-	DIR *dir = opendir(dirName.c_str());
-	if (dir == NULL)
-	{
-		return false;
-	}
-	bool found = false;
-	while (!found)
-	{
-		struct dirent *entry = readdir(dir);
-		if (entry == NULL)
-		{
-			break;
-		}
-		std::string name = lowerCaseString(entry->d_name);
-		if (name == lowerFilename)
-		{
-			path = dirName + '/' + entry->d_name;
-			found = true;
-		}
-	}
-	closedir(dir);
-	return found;
-}
-
-bool fileCaseCallback(char *filename)
-{
-	StringMap s_pathMap;
-	size_t count;
-	char **components = componentsSeparatedByString(filename, "/", count);
-	std::string lowerFilename = lowerCaseString(filename);
-
-	StringMap::iterator it = s_pathMap.find(lowerFilename);
-	if (it != s_pathMap.end())
-	{
-		strcpy(filename, it->second.c_str());
-		return true;
-	}
-	if (count > 1)
-	{
-		bool ok = true;
-		std::string builtPath = "/";
-		for (size_t i = 1; i + 1 < count && ok; ++i)
-		{
-			builtPath += components[i];
-
-			it = s_pathMap.find(builtPath);
-			if (it != s_pathMap.end())
-			{
-				// Do nothing
-			}
-			else if (dirExists(builtPath))
-			{
-				s_pathMap[lowerCaseString(builtPath)] = builtPath;
-			}
-			else if (findDirEntry(builtPath))
-			{
-				s_pathMap[lowerCaseString(builtPath)] = builtPath;
-				if (!dirExists(builtPath))
-				{
-					ok = false;
-				}
-			}
-			else
-			{
-				ok = false;
-			}
-			if (ok)
-			{
-				builtPath += '/';
-			}
-		}
-		if (ok)
-		{
-			builtPath += components[count - 1];
-			if (findDirEntry(builtPath))
-			{
-				s_pathMap[lowerCaseString(builtPath)] = builtPath;
-				ok = fileOrDirExists(builtPath);
-			}
-			else
-			{
-				ok = false;
-			}
-		}
-		if (ok)
-		{
-			strcpy(filename, builtPath.c_str());
-		}
-		deleteStringArray(components, count);
-		return ok;
-	}
-	return false;
-}
-
 #ifdef EGL
 void assertEGLError(const std::string& msg) {
 	EGLint error = eglGetError();

BuildPartsCatalog/filecase.cpp TCFoundation/filecase.cppBuildPartsCatalog/filecase.cpp renamed to TCFoundation/filecase.cpp

@@ -1,5 +1,5 @@
 #include "filecase.h"
-
+#if !defined (WIN32) && !defined (__APPLE__)
 typedef std::map<std::string, std::string> StringMap;
 
 bool dirExists(const std::string &path)
@@ -124,4 +124,4 @@ bool fileCaseCallback(char *filename)
 	}
 	return false;
 }
-
+#endif

BuildPartsCatalog/filecase.h TCFoundation/filecase.hBuildPartsCatalog/filecase.h renamed to TCFoundation/filecase.h

@@ -1,5 +1,6 @@
 #ifndef __FILECASE_H__
 #define __FILECASE_H__
+#if !defined (WIN32) && !defined (__APPLE__)
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/types.h>
@@ -11,3 +12,4 @@
 
 extern bool fileCaseCallback(char *filename);
 #endif
+#endif