i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cdda_read_dir(): Removed user buffer handling. We're only getting kernel

Browse Source 
buffers.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32385 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-08-14 18:38:05 +00:00
parent 7435db9ff0
commit ffdaa11d3c
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
+7 -11
View File
@@ -1852,25 +1852,21 @@ cdda_read_dir(fs_volume* _volume, fs_vnode* _node, void* _cookie,
break; break;
} }
struct dirent entry; buffer->d_dev = volume->FSVolume()->id;
entry.d_dev = volume->FSVolume()->id; buffer->d_ino = childNode->ID();
entry.d_ino = childNode->ID(); buffer->d_reclen = strlen(name) + sizeof(struct dirent);
entry.d_reclen = strlen(name) + sizeof(struct dirent);
if (entry.d_reclen > bufferSize) { if (buffer->d_reclen > bufferSize) {
if (count == 0) if (count == 0)
return ENOBUFS; return ENOBUFS;
break; break;
} }
if (user_memcpy(buffer, &entry, sizeof(struct dirent) - 1) != B_OK strcpy(buffer->d_name, name);
|| user_strlcpy(buffer->d_name, name,
bufferSize + 1 - sizeof(struct dirent)) < B_OK)
return B_BAD_ADDRESS;
buffer = (struct dirent*)((uint8*)buffer + entry.d_reclen); bufferSize -= buffer->d_reclen;
bufferSize -= entry.d_reclen; buffer = (struct dirent*)((uint8*)buffer + buffer->d_reclen);
count++; count++;
cookie->current = nextChildNode; cookie->current = nextChildNode;