kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

msvc: opendir: do not start the search 

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 <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Erik Faye-Lund 2010-11-23 19:38:26 +01:00 committed by Junio C Hamano
parent 17194c1e96
commit 20c6788ace
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compat/msvc.c
View File

@ -16,17 +16,13 @@ DIR *opendir(const char *name)
p->dd_name[len] = '/'; p->dd_name[len] = '/';
p->dd_name[len+1] = '*'; p->dd_name[len+1] = '*';


p->dd_handle = _findfirst(p->dd_name, &p->dd_dta); p->dd_handle = (long)INVALID_HANDLE_VALUE;

if (p->dd_handle == -1) {
free(p);
return NULL;
}
return p; return p;
} }
int closedir(DIR *dir) int closedir(DIR *dir)
{ {
_findclose(dir->dd_handle); if (dir->dd_handle != (long)INVALID_HANDLE_VALUE)
FindClose((HANDLE)dir->dd_handle);
free(dir); free(dir);
return 0; return 0;
} }