marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Work around a bug in Mac OS X's getdirentries().

oldstable
Ken Thomases 2007-10-05 10:48:55 -05:00 committed by Alexandre Julliard
parent 3eea9a6193
commit 54a471732f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/ntdll/directory.c
View File

@ -1173,6 +1173,26 @@ done:
#elif defined HAVE_GETDIRENTRIES
/***********************************************************************
* wine_getdirentries
*
* Wrapper for the BSD getdirentries system call to fix a bug in the
* Mac OS X version. For some file systems (at least Apple Filing
* Protocol a.k.a. AFP), getdirentries resets the file position to 0
* when it's about to return 0 (no more entries). So, a subsequent
* getdirentries call starts over at the beginning again, causing an
* infinite loop.
*/
static inline int wine_getdirentries(int fd, char *buf, int nbytes, long *basep)
{
int res = getdirentries(fd, buf, nbytes, basep);
#ifdef __APPLE__
if (res == 0)
lseek(fd, *basep, SEEK_SET);
#endif
return res;
}
/***********************************************************************
* read_directory_getdirentries
*
@ -1203,7 +1223,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff
io->u.Status = STATUS_SUCCESS;
/* FIXME: should make sure size is larger than filesystem block size */
res = getdirentries( fd, data, size, &restart_pos );
res = wine_getdirentries( fd, data, size, &restart_pos );
if (res == -1)
{
io->u.Status = FILE_GetNtStatus();
@ -1306,7 +1326,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff
restart_last_info = last_info;
restart_info_pos = io->Information;
restart:
res = getdirentries( fd, data, size, &restart_pos );
res = wine_getdirentries( fd, data, size, &restart_pos );
de = (struct dirent *)data;
}