From: Erik Faye-Lund Date: Tue, 23 Nov 2010 17:30:41 GMT Subject: [RFC PATCH 3/6] msvc: opendir: do not start the search Message-ID: <1290533444-3404-4-git-send-email-kusmabite@gmail.com> In-Reply-To: <1290533444-3404-1-git-send-email-kusmabite@gmail.com> compat/mingw.c's readdir expects to be the one that starts the search, and if it isn't, then the first entry will be missing or incorrect. Fix this by removing the call to _findfirst, and initializing dd_handle to INVALID_HANDLE_VALUE. At the same time, make sure we use FindClose instead of _findclose, which is symmetric to readdir's FindFirstFile. Take into account that the find-handle might already be closed by readdir. Signed-off-by: Erik Faye-Lund --- compat/msvc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/compat/msvc.c b/compat/msvc.c index 205304e..38f2d92 100644 --- a/compat/msvc.c +++ b/compat/msvc.c @@ -13,17 +13,13 @@ DIR *opendir(const char *name) p->dd_name[len] = '/'; p->dd_name[len+1] = '*'; - p->dd_handle = _findfirst(p->dd_name, &p->dd_dta); - - if (p->dd_handle == -1) { - free(p); - return NULL; - } + p->dd_handle = (long)INVALID_HANDLE_VALUE; return p; } int closedir(DIR *dir) { - _findclose(dir->dd_handle); + if (dir->dd_handle != (long)INVALID_HANDLE_VALUE) + FindClose((HANDLE)dir->dd_handle); free(dir); return 0; } -- 1.7.3.2.493.ge4bf7