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

Merge #4352

Browse source 
4352: Make opening files for reading on windows case insensitive (again) r=def- a=Robyt3

I don't know what the reason for 2a570196ef was, but this reverts it so files are opened case insensitively on Windows again. I assume it was done for consistency so file operations on all operating systems would be case sensitive, but then again I don't understand why it was only being applied when opening files for reading.

While NTFS is actually case sensitive, the normal Windows file API puts a case insensitive abstraction on top.
Previously, if you had multiple files with the same name but different capitalization it would open the file with the correct capitalization, in the unlikely case that you circumwented the file API to create those files. Now it opens the first one it finds non-deterministically, but will also consider a file with different capitalization.

This reverts to the previous behavior, before all the unicode changes, so I suppose it closes #4343.

## 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-11-13 22:51:33 +00:00 committed by GitHub
parent 3c19ccf42f c4e2dc5c5f
commit f4c1890228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/base/system.cpp
View file

@ -314,39 +314,13 @@ IOHANDLE io_open(const char *filename, int flags)
dbg_assert(flags == IOFLAG_READ || flags == IOFLAG_WRITE || flags == IOFLAG_APPEND, "flags must be read, write or append"); dbg_assert(flags == IOFLAG_READ || flags == IOFLAG_WRITE || flags == IOFLAG_APPEND, "flags must be read, write or append");
#if defined(CONF_FAMILY_WINDOWS) #if defined(CONF_FAMILY_WINDOWS)
WCHAR wBuffer[IO_MAX_PATH_LENGTH]; WCHAR wBuffer[IO_MAX_PATH_LENGTH];
MultiByteToWideChar(CP_UTF8, 0, filename, IO_MAX_PATH_LENGTH, wBuffer, IO_MAX_PATH_LENGTH);
if(flags == IOFLAG_READ) if(flags == IOFLAG_READ)
{
// check for filename case sensitive
WIN32_FIND_DATAW finddata;
HANDLE handle;
char buffer[IO_MAX_PATH_LENGTH];
int length = str_length(filename);
if(!filename || !length || filename[length - 1] == '\\')
return 0x0;
MultiByteToWideChar(CP_UTF8, 0, filename, IO_MAX_PATH_LENGTH, wBuffer, IO_MAX_PATH_LENGTH);
handle = FindFirstFileW(wBuffer, &finddata);
if(handle == INVALID_HANDLE_VALUE)
return 0x0;
WideCharToMultiByte(CP_UTF8, 0, finddata.cFileName, -1, buffer, IO_MAX_PATH_LENGTH, NULL, NULL);
if(str_comp(filename + length - str_length(buffer), buffer) != 0)
{
FindClose(handle);
return 0x0;
}
FindClose(handle);
return (IOHANDLE)_wfsopen(wBuffer, L"rb", _SH_DENYNO); return (IOHANDLE)_wfsopen(wBuffer, L"rb", _SH_DENYNO);
}
if(flags == IOFLAG_WRITE) if(flags == IOFLAG_WRITE)
{
MultiByteToWideChar(CP_UTF8, 0, filename, IO_MAX_PATH_LENGTH, wBuffer, IO_MAX_PATH_LENGTH);
return (IOHANDLE)_wfsopen(wBuffer, L"wb", _SH_DENYNO); return (IOHANDLE)_wfsopen(wBuffer, L"wb", _SH_DENYNO);
}
if(flags == IOFLAG_APPEND) if(flags == IOFLAG_APPEND)
{
MultiByteToWideChar(CP_UTF8, 0, filename, IO_MAX_PATH_LENGTH, wBuffer, IO_MAX_PATH_LENGTH);
return (IOHANDLE)_wfsopen(wBuffer, L"ab", _SH_DENYNO); return (IOHANDLE)_wfsopen(wBuffer, L"ab", _SH_DENYNO);
}
return 0x0; return 0x0;
#else #else
if(flags == IOFLAG_READ) if(flags == IOFLAG_READ)