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

Merge #4196

Browse source 
4196: Fix fs_removedir and fs_remove with unicode on windows r=Jupeyy a=Robyt3

Fixes `fs_removedir` and `fs_remove` to work with unicode names on Windows.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robert.mueller@uni-siegen.de>
This commit is contained in:
bors[bot] 2021-10-04 19:08:42 +00:00 committed by GitHub
parent 26d54f8c8c 2791f1e127
commit b2efcb8ba4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)
{
#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 -1;
#else
@ -2357,7 +2359,9 @@ int fs_parent_dir(char *path)
int fs_remove(const char *filename)
{
#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
return unlink(filename) != 0;
#endif