JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.cc (fhandler_base::open): Use major numbers rather than device

Browse Source 
numbers to control special behavior for devices which take units.
* fhandler_raw.cc (fhandler_dev_raw::writebuf): Ditto.
(fhandler_dev_raw::fstat): Ditto.
(fhandler_dev_raw::open): Ditto.
(fhandler_dev_raw::ioctl): Ditto.
This commit is contained in:
Christopher Faylor
2004-01-21 18:19:29 +00:00
parent 0a0c89ef54
commit 918f634fed
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
winsup/cygwin/fhandler_raw.cc
View File

@ -98,7 +98,7 @@ fhandler_dev_raw::writebuf (void)
int ret = 0;
memset (devbuf + devbufend, 0, devbufsiz - devbufend);
if (get_device () != FH_TAPE)
if (get_major () != DEV_TAPE_MAJOR)
to_write = ((devbufend - 1) / 512 + 1) * 512;
else if (varblkop)
to_write = devbufend;
@ -134,16 +134,10 @@ fhandler_dev_raw::fstat (struct __stat64 *buf)
{
debug_printf ("here");
switch (get_device ())
{
case FH_TAPE:
case FH_NTAPE:
buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
break;
default:
buf->st_mode = S_IFBLK | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
break;
}
if (get_major () == DEV_TAPE_MAJOR)
buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
else
buf->st_mode = S_IFBLK | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
buf->st_uid = geteuid32 ();
buf->st_gid = getegid32 ();
@ -176,7 +170,7 @@ fhandler_dev_raw::open (int flags, mode_t)
flags |= O_BINARY;
DWORD access = GENERIC_READ | SYNCHRONIZE;
if (get_device () == FH_TAPE
if (get_major () == DEV_TAPE_MAJOR
|| (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_WRONLY
|| (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDWR)
access |= GENERIC_WRITE;
@ -274,7 +268,7 @@ fhandler_dev_raw::raw_read (void *ptr, size_t& ulen)
{
if (!varblkop && len >= devbufsiz)
{
if (get_device () == FH_TAPE)
if (get_major () == DEV_TAPE_MAJOR)
bytes_to_read = (len / devbufsiz) * devbufsiz;
else
bytes_to_read = (len / 512) * 512;
@ -538,7 +532,7 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
switch (op->rd_op)
{
case RDSETBLK:
if (get_device () == FH_TAPE)
if (get_major () == DEV_TAPE_MAJOR)
{
struct mtop mop;