dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8821) -Regression: Unable to browse directories on *nix if the filesystem is not in UTF-8 charset and special characters are used. The string passed to opendir() which is UTF-8 was not parsed back to the filesystem format. Use a wrapper called ttd_opendir() instead of redefining opendir itself.

Browse Source
This commit is contained in:
Darkvater
2007-02-20 00:09:23 +00:00
parent 5b237758aa
commit 92bbe45dd0
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/win32.cpp
View File

@@ -653,19 +653,19 @@ static inline void dir_free(DIR *d)
}
}
DIR *opendir(const char *path)
DIR *opendir(const wchar_t *path)
{
DIR *d;
UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box
DWORD fa = GetFileAttributesW(OTTD2FS(path));
DWORD fa = GetFileAttributesW(path);
if ((fa != INVALID_FILE_ATTRIBUTES) && (fa & FILE_ATTRIBUTE_DIRECTORY)) {
d = dir_calloc();
if (d != NULL) {
char search_path[MAX_PATH];
wchar_t search_path[MAX_PATH];
/* build search path for FindFirstFile */
snprintf(search_path, lengthof(search_path), "%s" PATHSEP "*", path);
d->hFind = FindFirstFileW(OTTD2FS(search_path), &d->fd);
_snwprintf_s(search_path, lengthof(search_path), L"%s\\*", path);
d->hFind = FindFirstFileW(search_path, &d->fd);
if (d->hFind != INVALID_HANDLE_VALUE ||
GetLastError() == ERROR_NO_MORE_FILES) { // the directory is empty