edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 20:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fs_removedir and fs_remove with unicode on windows

Browse source
This commit is contained in:
Robert Müller 2021-10-04 20:11:47 +02:00
parent 126795d2ff
commit 2791f1e127
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/base/system.cpp
View file

@ -2271,7 +2271,9 @@ int fs_makedir(const char *path)
int fs_removedir(const char *path) int fs_removedir(const char *path)
{ {
#if defined(CONF_FAMILY_WINDOWS) #if defined(CONF_FAMILY_WINDOWS)
if(_rmdir(path) == 0) WCHAR wPath[IO_MAX_PATH_LENGTH];
MultiByteToWideChar(CP_UTF8, 0, path, IO_MAX_PATH_LENGTH, wPath, IO_MAX_PATH_LENGTH);
if(RemoveDirectoryW(wPath) != 0)
return 0; return 0;
return -1; return -1;
#else #else
@ -2357,7 +2359,9 @@ int fs_parent_dir(char *path)
int fs_remove(const char *filename) int fs_remove(const char *filename)
{ {
#if defined(CONF_FAMILY_WINDOWS) #if defined(CONF_FAMILY_WINDOWS)
return _unlink(filename) != 0; WCHAR wFilename[IO_MAX_PATH_LENGTH];
MultiByteToWideChar(CP_UTF8, 0, filename, IO_MAX_PATH_LENGTH, wFilename, IO_MAX_PATH_LENGTH);
return DeleteFileW(wFilename) == 0;
#else #else
return unlink(filename) != 0; return unlink(filename) != 0;
#endif #endif