mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
17194c1e96
commit
20c6788ace
|
@ -16,17 +16,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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue