summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/win32.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/win32.cpp b/src/win32.cpp
index dceda5e86..b59621aa6 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -665,8 +665,11 @@ DIR *opendir(const wchar_t *path)
d = dir_calloc();
if (d != NULL) {
wchar_t search_path[MAX_PATH];
- /* build search path for FindFirstFile */
- _snwprintf(search_path, lengthof(search_path), L"%s\\*", path);
+ bool slash = path[wcslen(path) - 1] == L'\\';
+
+ /* build search path for FindFirstFile, try not to append additional slashes
+ * as it throws Win9x off its groove for root directories */
+ _snwprintf(search_path, lengthof(search_path), L"%s%s*", path, slash ? L"" : L"\\");
*lastof(search_path) = '\0';
d->hFind = FindFirstFileW(search_path, &d->fd);