Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dirent handling. The d_reclen field contains the size of the whole record,

Browse Source 
so it includes sizeof(dirent).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33689 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2009-10-20 22:52:35 +00:00
parent b7c0cbd2f3
commit 35e7c9642f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kits/tracker/EntryIterator.cpp
View File

@ -124,7 +124,7 @@ EntryListBase::InitCheck() const
dirent *
EntryListBase::Next(dirent *ent)
{
return (dirent *)((char *)ent + ent->d_reclen + sizeof(dirent));
return (dirent *)((char *)ent + ent->d_reclen);
}
@ -251,7 +251,7 @@ CachedEntryIterator::GetNextDirents(struct dirent *ent, size_t size,
if (fIndex >= fNumEntries) {
// we are out of stock, cache em up
fCurrentDirent = fDirentBuffer;
uint32 bufferRemain = kDirentBufferSize;
int32 bufferRemain = kDirentBufferSize;
for (fNumEntries = 0; fNumEntries < fCacheSize; ) {
int32 count = fIterator->GetNextDirents(fCurrentDirent,
bufferRemain, 1);
@ -261,10 +261,11 @@ CachedEntryIterator::GetNextDirents(struct dirent *ent, size_t size,
fNumEntries += count;
int32 currentDirentSize = fCurrentDirent->d_reclen
+ (ssize_t)sizeof(dirent);
int32 currentDirentSize = fCurrentDirent->d_reclen;
bufferRemain -= currentDirentSize;
if (bufferRemain < (sizeof(dirent) + B_FILE_NAME_LENGTH)) {
ASSERT(bufferRemain >= 0);
if ((size_t)bufferRemain < (sizeof(dirent) + B_FILE_NAME_LENGTH)) {
// cant fit a big entryRef in the buffer, just bail
// and start from scratch
break;
@ -298,7 +299,7 @@ CachedEntryIterator::GetNextDirents(struct dirent *ent, size_t size,
fCurrentDirent = fSortedList->ItemAt(fIndex);
fIndex++;
uint32 currentDirentSize = fCurrentDirent->d_reclen + sizeof(dirent);
uint32 currentDirentSize = fCurrentDirent->d_reclen;
ASSERT(currentDirentSize <= size);
if (currentDirentSize > size)
return 0;