Skip to content

Commit b02c8eb

Browse files
committed
[linux] add convert_path_sep to file_service.cpp and s_device.cpp
1 parent 3135f30 commit b02c8eb

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/apps/engine/src/file_service.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FILE_SERVICE::~FILE_SERVICE()
4141

4242
std::fstream FILE_SERVICE::_CreateFile(const char *filename, std::ios::openmode mode)
4343
{
44-
const auto path = filename ? std::filesystem::u8path(filename) : std::filesystem::path();
44+
const auto path = filename ? std::filesystem::u8path(convert_path_sep(filename)) : std::filesystem::path();
4545
std::fstream fileS(path, mode);
4646
return fileS;
4747
}
@@ -58,7 +58,7 @@ void FILE_SERVICE::_SetFilePointer(std::fstream &fileS, std::streamoff off, std:
5858

5959
bool FILE_SERVICE::_DeleteFile(const char *filename)
6060
{
61-
std::filesystem::path path = std::filesystem::u8path(filename);
61+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(filename));
6262
return std::filesystem::remove(path);
6363
}
6464

@@ -94,7 +94,7 @@ bool FILE_SERVICE::_ReadFile(std::fstream &fileS, void *s, std::streamsize count
9494

9595
bool FILE_SERVICE::_FileOrDirectoryExists(const char *p)
9696
{
97-
std::filesystem::path path = std::filesystem::u8path(p);
97+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(p));
9898
return std::filesystem::exists(path);
9999
}
100100

@@ -125,7 +125,7 @@ std::vector<std::filesystem::path> FILE_SERVICE::_GetFsPathsByMask(const char *s
125125
}
126126
else
127127
{
128-
srcPath = std::filesystem::u8path(sourcePath);
128+
srcPath = std::filesystem::u8path(convert_path_sep(sourcePath));
129129
}
130130

131131
std::filesystem::path curPath;
@@ -171,7 +171,7 @@ std::time_t FILE_SERVICE::_ToTimeT(std::filesystem::file_time_type tp)
171171

172172
std::filesystem::file_time_type FILE_SERVICE::_GetLastWriteTime(const char *filename)
173173
{
174-
std::filesystem::path path = std::filesystem::u8path(filename);
174+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(filename));
175175
return std::filesystem::last_write_time(path);
176176
}
177177

@@ -195,25 +195,25 @@ std::string FILE_SERVICE::_GetExecutableDirectory()
195195

196196
std::uintmax_t FILE_SERVICE::_GetFileSize(const char *filename)
197197
{
198-
std::filesystem::path path = std::filesystem::u8path(filename);
198+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(filename));
199199
return std::filesystem::file_size(path);
200200
}
201201

202202
void FILE_SERVICE::_SetCurrentDirectory(const char *pathName)
203203
{
204-
std::filesystem::path path = std::filesystem::u8path(pathName);
204+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(pathName));
205205
std::filesystem::current_path(path);
206206
}
207207

208208
bool FILE_SERVICE::_CreateDirectory(const char *pathName)
209209
{
210-
std::filesystem::path path = std::filesystem::u8path(pathName);
210+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(pathName));
211211
return std::filesystem::create_directories(path);
212212
}
213213

214214
std::uintmax_t FILE_SERVICE::_RemoveDirectory(const char *pathName)
215215
{
216-
std::filesystem::path path = std::filesystem::u8path(pathName);
216+
std::filesystem::path path = std::filesystem::u8path(convert_path_sep(pathName));
217217
return std::filesystem::remove_all(path);
218218
}
219219

src/libs/renderer/src/s_device.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ int32_t DX9RENDER::TextureCreate(const char *fname)
13761376
return -1L;
13771377
}
13781378

1379-
std::filesystem::path path = fname;
1379+
std::filesystem::path path = convert_path_sep(fname);
13801380
std::string pathStr = path.extension().string();
13811381
if (storm::iEquals(pathStr, ".tx"))
13821382
path.replace_extension();

0 commit comments

Comments
 (0)