diff options
author | Christopher Faylor <me@cgf.cx> | 2001-10-15 23:39:33 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-10-15 23:39:33 +0000 |
commit | df63bd490a526af2d68f391f703abe8b54a502db (patch) | |
tree | 7d513f2946631bb2116a1340844c2b0146368497 /winsup/cygwin/ioctl.cc | |
parent | fff126983e3de911ae6d10fb3483f661053bacf7 (diff) | |
download | cygnal-df63bd490a526af2d68f391f703abe8b54a502db.tar.gz cygnal-df63bd490a526af2d68f391f703abe8b54a502db.tar.bz2 cygnal-df63bd490a526af2d68f391f703abe8b54a502db.zip |
* fhandler.cc (fhandler_base::fork_fixup): Don't protect handle.
* dlfcn.cc: Fix to confirm to coding standards. Reorganize includes throughout
to accomodate new cygheap.h usage.
* cygheap.h (cygheap_fdmanip): New class: simplifies locking and retrieval of
fds from cygheap->fdtab.
(cygheap_fdget): Ditto.
(cygheap_fdnew): Ditto.
* fcntl.cc (_fcntl): Use new method to lock fdtab and retrieve info.
* ioctl.cc (ioctl): Ditto.
* mmap.cc (mmap): Ditto.
* net.cc: Ditto, throughout.
* passwd.cc (getpass): Ditto.
* path.cc (fchdir): Ditto.
* pipe.cc (make_pipe): Ditto.
* sec_acl.cc (facl): Ditto.
* syscalls.cc: Ditto, throughout.
* termios.cc: Ditto, throughout.
Diffstat (limited to 'winsup/cygwin/ioctl.cc')
-rw-r--r-- | winsup/cygwin/ioctl.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/winsup/cygwin/ioctl.cc b/winsup/cygwin/ioctl.cc index 93fe9ddf5..98c157800 100644 --- a/winsup/cygwin/ioctl.cc +++ b/winsup/cygwin/ioctl.cc @@ -25,15 +25,12 @@ details. */ extern "C" int ioctl (int fd, int cmd, void *buf) { - if (cygheap->fdtab.not_open (fd)) - { - set_errno (EBADF); - return -1; - } + cygheap_fdget cfd (fd); + if (cfd < 0) + return -1; debug_printf ("fd %d, cmd %x\n", fd, cmd); - fhandler_base *fh = cygheap->fdtab[fd]; - if (fh->is_tty () && fh->get_device () != FH_PTYM) + if (cfd->is_tty () && cfd->get_device () != FH_PTYM) switch (cmd) { case TCGETA: @@ -46,5 +43,5 @@ ioctl (int fd, int cmd, void *buf) return tcsetattr (fd, TCSAFLUSH, (struct termios *) buf); } - return fh->ioctl (cmd, buf); + return cfd->ioctl (cmd, buf); } |