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

No longer use user_strcpy() but user_strlcpy().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6695 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-02-23 05:03:04 +00:00
parent 083d73d739
commit 26b91cb6ec
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/fs/bootfs.c
+3 -3
View File
@@ -742,7 +742,7 @@ bootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
{ {
struct bootfs_cookie *cookie = _cookie; struct bootfs_cookie *cookie = _cookie;
struct bootfs *fs = _fs; struct bootfs *fs = _fs;
status_t status; status_t status = B_OK;
TRACE(("bootfs_read_dir(fs_volume = %p vnode = %p, fs_cookie = %p, buffer = %p, bufferSize = %ld, num = %ld)\n",_fs, _vnode, cookie, dirent, bufferSize, *_num)); TRACE(("bootfs_read_dir(fs_volume = %p vnode = %p, fs_cookie = %p, buffer = %p, bufferSize = %ld, num = %ld)\n",_fs, _vnode, cookie, dirent, bufferSize, *_num));
@@ -750,7 +750,6 @@ bootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
if (cookie->u.dir.ptr == NULL) { if (cookie->u.dir.ptr == NULL) {
*_num = 0; *_num = 0;
status = B_OK;
goto err; goto err;
} }
@@ -763,11 +762,12 @@ bootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
goto err; goto err;
} }
status = user_strcpy(dirent->d_name, cookie->u.dir.ptr->name); status = user_strlcpy(dirent->d_name, cookie->u.dir.ptr->name, bufferSize - sizeof(struct dirent));
if (status < B_OK) if (status < B_OK)
goto err; goto err;
cookie->u.dir.ptr = cookie->u.dir.ptr->dir_next; cookie->u.dir.ptr = cookie->u.dir.ptr->dir_next;
status = B_OK;
err: err:
mutex_unlock(&fs->lock); mutex_unlock(&fs->lock);
src/kernel/core/fs/devfs.c
+4 -4
View File
@@ -797,7 +797,7 @@ devfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
{ {
struct devfs_cookie *cookie = _cookie; struct devfs_cookie *cookie = _cookie;
struct devfs *fs = _fs; struct devfs *fs = _fs;
status_t status = 0; status_t status = B_OK;
TRACE(("devfs_read_dir: vnode %p, cookie %p, buffer %p, size %ld\n", _vnode, cookie, dirent, bufferSize)); TRACE(("devfs_read_dir: vnode %p, cookie %p, buffer %p, size %ld\n", _vnode, cookie, dirent, bufferSize));
@@ -808,7 +808,6 @@ devfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
if (cookie->u.dir.ptr == NULL) { if (cookie->u.dir.ptr == NULL) {
*_num = 0; *_num = 0;
status = B_OK;
goto err; goto err;
} }
@@ -821,11 +820,12 @@ devfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
goto err; goto err;
} }
status = user_strcpy(dirent->d_name, cookie->u.dir.ptr->name); status = user_strlcpy(dirent->d_name, cookie->u.dir.ptr->name, bufferSize - sizeof(struct dirent));
if (status < 0) if (status < B_OK)
goto err; goto err;
cookie->u.dir.ptr = cookie->u.dir.ptr->dir_next; cookie->u.dir.ptr = cookie->u.dir.ptr->dir_next;
status = B_OK;
err: err:
mutex_unlock(&fs->lock); mutex_unlock(&fs->lock);
src/kernel/core/fs/rootfs.c
+4 -4
View File
@@ -637,7 +637,7 @@ rootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
{ {
struct rootfs_cookie *cookie = _cookie; struct rootfs_cookie *cookie = _cookie;
struct rootfs *fs = _fs; struct rootfs *fs = _fs;
status_t status = 0; status_t status = B_OK;
TRACE(("rootfs_read_dir: vnode %p, cookie %p, buffer = %p, bufferSize = %ld, num = %p\n", _vnode, cookie, dirent, bufferSize,_num)); TRACE(("rootfs_read_dir: vnode %p, cookie %p, buffer = %p, bufferSize = %ld, num = %p\n", _vnode, cookie, dirent, bufferSize,_num));
@@ -646,7 +646,6 @@ rootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
if (cookie->ptr == NULL) { if (cookie->ptr == NULL) {
// we're at the end of the directory // we're at the end of the directory
*_num = 0; *_num = 0;
status = B_OK;
goto err; goto err;
} }
@@ -659,11 +658,12 @@ rootfs_read_dir(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, struct dirent
goto err; goto err;
} }
status = user_strcpy(dirent->d_name, cookie->ptr->name); status = user_strlcpy(dirent->d_name, cookie->ptr->name, bufferSize - sizeof(struct dirent));
if (status < 0) if (status < B_OK)
goto err; goto err;
cookie->ptr = cookie->ptr->dir_next; cookie->ptr = cookie->ptr->dir_next;
status = B_OK;
err: err:
mutex_unlock(&fs->lock); mutex_unlock(&fs->lock);