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

{rootfs|devfs}_read_link() did not report the correct link size on

Browse Source 
success (they just kept the passed in buffer size unchanged).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12821 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-05-26 02:04:00 +00:00
parent a460a8f084
commit 1333009e1c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/kernel/fs/devfs.cpp
View File

@ -1150,14 +1150,16 @@ static status_t
devfs_read_link(fs_volume _fs, fs_vnode _link, char *buffer, size_t *_bufferSize)
{
struct devfs_vnode *link = (struct devfs_vnode *)_link;
size_t bufferSize = *_bufferSize;
if (!S_ISLNK(link->stream.type))
return B_BAD_VALUE;
if (*_bufferSize <= link->stream.u.symlink.length) {
*_bufferSize = link->stream.u.symlink.length + 1;
*_bufferSize = link->stream.u.symlink.length + 1;
// we always need to return the number of bytes we intend to write!
if (bufferSize <= link->stream.u.symlink.length)
return B_BUFFER_OVERFLOW;
}
memcpy(buffer, link->stream.u.symlink.path, link->stream.u.symlink.length + 1);
return B_OK;

8
src/system/kernel/fs/rootfs.c
View File

@ -784,14 +784,16 @@ static status_t
rootfs_read_link(fs_volume _fs, fs_vnode _link, char *buffer, size_t *_bufferSize)
{
struct rootfs_vnode *link = _link;
size_t bufferSize = *_bufferSize;
if (!S_ISLNK(link->stream.type))
return B_BAD_VALUE;
if (*_bufferSize <= link->stream.symlink.length) {
*_bufferSize = link->stream.symlink.length + 1;
*_bufferSize = link->stream.symlink.length + 1;
// we always need to return the number of bytes we intend to write!
if (bufferSize <= link->stream.symlink.length)
return B_BUFFER_OVERFLOW;
}
memcpy(buffer, link->stream.symlink.path, link->stream.symlink.length + 1);
return B_OK;