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

* Use user_strlcpy() instead of this scary combination of strnlen() and user_memcpy().

Browse Source 
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18714 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-08-30 22:39:20 +00:00
parent 8001b0c614
commit 190aa14f19
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1549,9 +1549,8 @@ devfs_ioctl(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, ulong op,
TRACE(("devfs_ioctl: vnode %p, cookie %p, op %ld, buf %p, len %ld\n", TRACE(("devfs_ioctl: vnode %p, cookie %p, op %ld, buf %p, len %ld\n",
_vnode, _cookie, op, buffer, length)); _vnode, _cookie, op, buffer, length));
/* we are actually checking for a *device* here, we don't make the distinction // we are actually checking for a *device* here, we don't make the distinction
* between char and block devices (yet ?) // between char and block devices
*/
if (S_ISCHR(vnode->stream.type)) { if (S_ISCHR(vnode->stream.type)) {
switch (op) { switch (op) {
case B_GET_GEOMETRY: case B_GET_GEOMETRY:
@ -1570,7 +1569,8 @@ devfs_ioctl(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, ulong op,
geometry.sectors_per_track = 0; geometry.sectors_per_track = 0;
if (geometry.bytes_per_sector == 0) if (geometry.bytes_per_sector == 0)
geometry.bytes_per_sector = 512; geometry.bytes_per_sector = 512;
geometry.sectors_per_track = partition->info.size / geometry.bytes_per_sector; geometry.sectors_per_track = partition->info.size
/ geometry.bytes_per_sector;
geometry.head_count = 1; geometry.head_count = 1;
geometry.cylinder_count = 1; geometry.cylinder_count = 1;
@ -1579,14 +1579,14 @@ devfs_ioctl(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, ulong op,
case B_GET_DRIVER_FOR_DEVICE: case B_GET_DRIVER_FOR_DEVICE:
{ {
const char *dpath; const char *path;
if (!vnode->stream.u.dev.driver) if (!vnode->stream.u.dev.driver)
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
dpath = vnode->stream.u.dev.driver->path; path = vnode->stream.u.dev.driver->path;
if (!dpath) if (path == NULL)
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
// should make sure it's \0 terminated on truncation
return user_memcpy(buffer, dpath, strnlen(dpath, 255)+1); return user_strlcpy((char *)buffer, path, B_FILE_NAME_LENGTH);
} }
case B_GET_PARTITION_INFO: case B_GET_PARTITION_INFO:
@ -1607,17 +1607,17 @@ devfs_ioctl(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, ulong op,
{ {
char path[256]; char path[256];
status_t err; status_t err;
/* XXX: we might want to actually find the mountpoint /* TODO: we might want to actually find the mountpoint
* of that instance of devfs... * of that instance of devfs...
* but for now we assume it's mounted on /dev * but for now we assume it's mounted on /dev
*/ */
strcpy(path, "/dev/"); strcpy(path, "/dev/");
get_device_name(vnode, path + 5, sizeof(path) - 5); get_device_name(vnode, path + 5, sizeof(path) - 5);
err = user_memcpy(buffer, path, strnlen(path, sizeof(path)-1)+1); return user_strlcpy((char *)buffer, path, sizeof(path));
return err;
} }
/* old unsupported R5 private stuff */ // old unsupported R5 private stuff
case B_GET_NEXT_OPEN_DEVICE: case B_GET_NEXT_OPEN_DEVICE:
dprintf("devfs: unsupported legacy ioctl B_GET_NEXT_OPEN_DEVICE\n"); dprintf("devfs: unsupported legacy ioctl B_GET_NEXT_OPEN_DEVICE\n");
return B_NOT_SUPPORTED; return B_NOT_SUPPORTED;