Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into upstream-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlaux committed Sep 11, 2024
2 parents 9f38843 + af69587 commit 8a53b78
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions win32/win_opendir.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ static DIR *__internal_opendir(wchar_t *wname, int size)
{
struct __dir *data = NULL;
struct dirent *tmp_entries = NULL;
static char default_char = '?';
static wchar_t *suffix = L"\\*.*";
static int extra_prefix = 4; /* use prefix "\\?\" to handle long file names */
static int extra_suffix = 4; /* use suffix "\*.*" to find everything */
Expand Down Expand Up @@ -222,7 +221,7 @@ static DIR *__internal_opendir(wchar_t *wname, int size)
{
WideCharToMultiByte(CP_UTF8, 0, w32fd.cFileName, -1,
data->entries[data->index].d_name, NAME_MAX,
&default_char, NULL);
NULL, NULL);

memcpy(wname + size, w32fd.cFileName, sizeof(wchar_t) * NAME_MAX);

Expand Down

0 comments on commit 8a53b78

Please sign in to comment.