diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-01-21 21:19:29 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-01-21 21:19:29 +0300 |
| commit | 918f634fed57f28899ec9d2ed1d9922a57ee8cb4 (patch) | |
| tree | 8667f4e62b5499cbfb0fe147dd502c3147e01103 /winsup/cygwin/fhandler_raw.cc | |
| parent | 0a0c89ef546fb75187312603f074b9ac0cf5b0ae (diff) | |
* fhandler.cc (fhandler_base::open): Use major numbers rather than device
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.
Diffstat (limited to 'winsup/cygwin/fhandler_raw.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_raw.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc index 1ece53107..eb721a7e8 100644 --- a/winsup/cygwin/fhandler_raw.cc +++ b/winsup/cygwin/fhandler_raw.cc @@ -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; |