Fixed the broken ioctl() function. Unlike BeOS, it also passes the
eventually specified length parameter. The IOCPARM_LEN() macro should be used by the device/file system implementation only if applicable. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7828 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,12 +1,11 @@
|
|||||||
/*
|
/*
|
||||||
** Copyright 2002, Axel Dörfler, [email protected]. All rights reserved.
|
** Copyright 2002-2004, Axel Dörfler, [email protected]. All rights reserved.
|
||||||
** Distributed under the terms of the OpenBeOS License.
|
** Distributed under the terms of the OpenBeOS License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <syscalls.h>
|
#include <syscalls.h>
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
@@ -23,12 +22,17 @@ int
|
|||||||
ioctl(int fd, ulong cmd, ...)
|
ioctl(int fd, ulong cmd, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
int err;
|
void *argument;
|
||||||
|
size_t size;
|
||||||
|
int status;
|
||||||
|
|
||||||
va_start(args, cmd);
|
va_start(args, cmd);
|
||||||
err = sys_ioctl(fd, cmd, args, IOCPARM_LEN(cmd));
|
argument = va_arg(args, void *);
|
||||||
|
size = va_arg(args, size_t);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
RETURN_AND_SET_ERRNO(err)
|
status = sys_ioctl(fd, cmd, argument, size);
|
||||||
|
|
||||||
|
RETURN_AND_SET_ERRNO(status)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user