Linux, xrCore: now directory creates without change of (const char *)…

… arg
OpenXRay · Nov 9, 2018 · 8dea7d2 · 8dea7d2
1 parent af2dab6
commit 8dea7d2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -438,11 +438,7 @@ inline int _filelength(int fd)
 #define _read read
 #define _set_new_handler std::set_new_handler
 #define _finite isfinite
-inline int _mkdir(const char *dir)
-{
-    while (char* sep = strchr((char *)dir, '\\')) *sep = '/';
-    return mkdir(dir, S_IRWXU);
-}
+inline int _mkdir(const char *dir) { return mkdir(dir, S_IRWXU); }
 
 #define _wtoi(arg) wcstol(arg, NULL, 10)
 #define _wtoi64(arg) wcstoll(arg, NULL, 10)

diff --git a/src/xrCore/FS.cpp b/src/xrCore/FS.cpp
@@ -86,6 +86,7 @@ void VerifyPath(pcstr path)
             continue;
         CopyMemory(tmp, path, i);
         tmp[i] = 0;
+        convert_path_separators(tmp);
         _mkdir(tmp);
     }
 }

diff --git a/src/xrCore/FS_internal.h b/src/xrCore/FS_internal.h
@@ -27,21 +27,24 @@ class CFileWriter : public IWriter
         R_ASSERT(name && name[0]);
         fName = name;
         VerifyPath(fName.c_str());
+        pstr conv_fn = xr_strdup(name);
+        convert_path_separators(conv_fn);
         if (exclusive)
         {
-            int handle = _sopen(fName.c_str(), _O_WRONLY | _O_TRUNC | _O_CREAT | _O_BINARY, SH_DENYWR);
+            int handle = _sopen(conv_fn, _O_WRONLY | _O_TRUNC | _O_CREAT | _O_BINARY, SH_DENYWR);
 #ifdef _EDITOR
             if (handle == -1)
-                Msg("!Can't create file: '%s'. Error: '%s'.", *fName, _sys_errlist[errno]);
+                Msg("!Can't create file: '%s'. Error: '%s'.", conv_fn, _sys_errlist[errno]);
 #endif
             hf = _fdopen(handle, "wb");
         }
         else
         {
-            hf = fopen(fName.c_str(), "wb");
+            hf = fopen(conv_fn, "wb");
             if (hf == 0)
-                Msg("!Can't write file: '%s'. Error: '%s'.", fName.c_str(), _sys_errlist[errno]);
+                Msg("!Can't write file: '%s'. Error: '%s'.", conv_fn, _sys_errlist[errno]);
         }
+        xr_free(conv_fn);
     }
 
     virtual ~CFileWriter()

diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp
@@ -1696,9 +1696,9 @@ void CLocatorAPI::file_rename(pcstr src, pcstr dest, bool overwrite)
         m_files.insert(new_desc);
 
         // physically rename file
+        VerifyPath(dest);
         pstr conv_dest = xr_strdup(dest);
         convert_path_separators(conv_dest);
-        VerifyPath(conv_dest);
         rename(src, conv_dest);
         xr_free(conv_dest);
     }

diff --git a/src/xrCore/LocatorAPI_defs.cpp b/src/xrCore/LocatorAPI_defs.cpp
@@ -52,7 +52,6 @@ FS_Path::FS_Path(LPCSTR _Root, LPCSTR _Add, LPCSTR _DefExt, LPCSTR _FilterCaptio
     m_Flags.assign(flags);
 #ifdef _EDITOR
     // Editor(s)/User(s) wants pathes already created in "real" file system :)
-    convert_path_separators(m_Path);
     VerifyPath(m_Path);
 #endif
 }