Common: big refactor FS loading on linux

Author: eagleivg

src/Common/FSMacros.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#if defined(LINUX)
-#define _DELIMITER '/' //for looking
-#define DELIMITER "/" // for insert
-#elif defined(WINDOWS)
+//#if defined(LINUX)
+//#define _DELIMITER '/' //for looking
+//#define DELIMITER "/" // for insert
+//#elif defined(WINDOWS)
 #define _DELIMITER '\\' //for looking
 #define DELIMITER "\\" // for insert
-#endif
+//#endif
 
 // game path definition
 #define _game_data_ "$game_data$"

src/Common/PlatformLinux.inl

@@ -89,47 +89,48 @@ inline void Sleep(int ms)
     usleep(ms * 1000);
 }
 
-#include <libgen.h>
-inline void _splitpath (
-        const char* path,  // Path Input
-        char* drive,       // Drive     : Output
-        char* dir,         // Directory : Output
-        char* fname,       // Filename  : Output
-        char* ext          // Extension : Output
-){
-    char tmp[PATH_MAX] = {0};
-    if(!realpath(path, tmp))
-        strcpy(tmp, path);
+inline void _splitpath(const char* path, // Path Input
+        char* drive, // Drive     : Output
+        char* dir, // Directory : Output
+        char* fname, // Filename  : Output
+        char* ext // Extension : Output
+        )
+{
+    const char *p, *end;
 
     if(drive)
         strcpy(drive, "");
 
-    if(dir) {
-        char tmp_dir[PATH_MAX] = {0};
-        strcpy(tmp_dir, tmp); // W/A for fname broking
-        strcpy(dir, dirname(tmp_dir)); // This eval modify dirname argument!!!
-        if (dir[0] && dir[strlen(dir) - 1] != '/')
-            strcat(dir, "/");
+    end = NULL;
+    for(p = path; *p; p++)
+        if(*p == '/' || *p == '\\')
+            end = p + 1;
+
+    if(end)
+    {
+        if(dir)
+        {
+            memcpy(dir, path, end - path);
+            dir[end - path] = 0;
+        }
+        path = end;
     }
+    else if(dir)
+        dir[0] = 0;
+
+    end = strchr(path, '.');
+
+    if(!end)
+        end = p;
 
     if(fname)
     {
-        strcpy(fname, basename(tmp));
-        char *pos = strrchr(fname, '.');
-        if(pos != NULL)
-            *pos = 0;
+        memcpy(fname, path, end - path);
+        fname[end - path] = 0;
     }
 
     if(ext)
-    {
-        char tmp_ext[NAME_MAX] = { 0 };
-        strcpy(tmp_ext, basename(tmp));
-        char *pos = strrchr(tmp_ext, '.');
-        if(pos != NULL)
-            strcpy(ext, pos);
-        else
-            strcpy(ext, "");
-    }
+        strcpy(ext, end);
 }
 
 #include <iostream>
@@ -350,7 +351,12 @@ inline int _filelength(int fd)
 #define _read read
 #define _set_new_handler std::set_new_handler
 #define _finite isfinite
-#define _mkdir(dir) mkdir(dir, S_IRWXU)
+inline int _mkdir(const char *dir)
+{
+    while (char* sep = strchr((char *)dir, '\\')) *sep = '/';
+    return mkdir(dir, S_IRWXU);
+}
+
 #define _wtoi(arg) wcstol(arg, NULL, 10)
 #define _wtoi64(arg) wcstoll(arg, NULL, 10)
 #undef min

src/Layers/xrRender/FBasicVisual.cpp

@@ -68,10 +68,6 @@ void dxRender_Visual::Load(const char* N, IReader* data, u32)
         string256 fnT, fnS;
         data->r_stringZ(fnT, sizeof(fnT));
         data->r_stringZ(fnS, sizeof(fnS));
-#ifdef LINUX
-        while (char* sep = strchr(fnT, '\\')) *sep = '/';
-        while (char* sep = strchr(fnS, '\\')) *sep = '/';
-#endif
         shader.create(fnS, fnT);
     }
 

src/Layers/xrRender/ModelPool.cpp

@@ -219,9 +219,6 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data)
     string_path low_name;
     VERIFY(xr_strlen(name) < sizeof(low_name));
     xr_strcpy(low_name, name);
-#ifdef LINUX
-    while (char* sep = strchr(low_name, '\\')) *sep = '/';
-#endif
     xr_strlwr(low_name);
     if (strext(low_name))
         *strext(low_name) = 0;

src/Layers/xrRender/ParticleEffectDef.cpp

@@ -46,11 +46,6 @@ void CPEDef::CreateShader()
 {
     if (*m_ShaderName && *m_TextureName)
     {
-#ifdef LINUX
-        while (char* sep = strchr(*m_ShaderName, '\\')) *sep = '/';
-        while (char* sep = strchr(*m_TextureName, '\\')) *sep = '/';
-#endif
-
         m_CachedShader.create(*m_ShaderName, *m_TextureName);
     }
 }

src/Layers/xrRender/ResourceManager.cpp

@@ -190,7 +190,6 @@ Shader* CResourceManager::_cpp_Create(
     C.bEditor = FALSE;
     C.bDetail = FALSE;
 #ifdef _EDITOR
-<<<<<<< HEAD
     if (!C.BT)
     {
         ELog.Msg(mtError, "Can't find shader '%s'", s_shader);

src/Layers/xrRender/ResourceManager_Loader.cpp

@@ -96,9 +96,6 @@ void CResourceManager::OnDeviceCreate(IReader* F)
         {
             CBlender_DESC desc;
             chunk->r(&desc, sizeof(desc));
-#ifdef LINUX
-            while (char* sep = strchr(desc.cName, '\\')) *sep = '/';
-#endif
             IBlender* B = IBlender::Create(desc.CLS);
             if (nullptr == B)
             {

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -771,9 +771,6 @@ void CKinematicsAnimated::Load(const char* N, IReader* data, u32 dwFlags)
         for (u32 k = 0; k < set_cnt; ++k)
         {
             data->r_stringZ(nm, sizeof(nm));
-#ifdef LINUX
-            while (char* sep = strchr(nm, '\\')) *sep = '/';
-#endif
             xr_strcat(nm, ".omf");
             string_path fn;
             if (!FS.exist(fn, "$level$", nm))

src/Layers/xrRender/SkeletonCustom.cpp

@@ -184,9 +184,6 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags)
         {
             string_path lod_name;
             LD->r_string(lod_name, sizeof(lod_name));
-#ifdef LINUX
-            while (char* sep = strchr(lod_name, '\\')) *sep = '/';
-#endif
             //.         strconcat       (sizeof(name_load),name_load, short_name, ":lod:", lod_name.c_str());
             m_lod = (dxRender_Visual*)GEnv.Render->model_CreateChild(lod_name, nullptr);
 

src/Layers/xrRender/uber_deffer.cpp

@@ -30,9 +30,6 @@ void uber_deffer(CBlender_Compile& C, bool hq, LPCSTR _vspec, LPCSTR _pspec, BOO
     strconcat(sizeof(vs), vs, "deffer_", _vspec, lmap ? "_lmh" : "");
     strconcat(sizeof(ps), ps, "deffer_", _pspec, lmap ? "_lmh" : "");
     xr_strcpy(dt, sizeof(dt), _detail_replace ? _detail_replace : (C.detail_texture ? C.detail_texture : ""));
-#ifdef LINUX
-    while (char* sep = strchr(dt, '\\')) *sep = '/';
-#endif
 
     // detect detail bump
     string256 texDetailBump = {'\0'};