diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2001-08-14 07:41:45 +0000 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2001-08-14 07:41:45 +0000 |
commit | 6a574f1ad6df42447a242b521c3bdc9e9039910c (patch) | |
tree | ae49f1fb41c40a10c1ab7e97240d0eb3b89fb265 /winsup/cygwin/fhandler.cc | |
parent | 52c80be81471afa563671b5b78e8de702faa54d6 (diff) | |
download | cygnal-6a574f1ad6df42447a242b521c3bdc9e9039910c.tar.gz cygnal-6a574f1ad6df42447a242b521c3bdc9e9039910c.tar.bz2 cygnal-6a574f1ad6df42447a242b521c3bdc9e9039910c.zip |
* fhandler.cc (fhandler_base::fcntl): Use new O_NONBLOCK_MASK define.
* fhandler.h: Move definitions of O_NOSYMLINK, O_DIROPEN and
OLD_O_NDELAY from winsup.h to here. Add O_NONBLOCK_MASK define.
* fhandler_socket.cc (fhandler_socket::close): Add hack to allow
a graceful shutdown even if shutdown() hasn't been called by the
application. Add debug output.
(fhandler_socket::ioctl): Set fhandler's NONBLOCK flag according
to FIONBIO setting.
(fhandler_socket::fcntl): Use new O_NONBLOCK_MASK define. Actually
set `request' before using it.
* fhandler_tty.cc: Use new O_NONBLOCK_MASK define throughout.
(fhandler_tty_slave::ioctl): Set fhandler's NONBLOCK flag according
to FIONBIO setting.
(fhandler_pty_master::ioctl): Ditto.
* net.cc (wsock_event::prepare): Compare WSACreateEvent return code
with `WSA_INVALID_EVENT' according to MSDN.
* syscalls.cc (_read): Use new O_NONBLOCK_MASK define.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
-rw-r--r-- | winsup/cygwin/fhandler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 98b80b938..c4af734c0 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1094,7 +1094,7 @@ int fhandler_base::fcntl (int cmd, void *arg) * Since O_ASYNC isn't defined in fcntl.h it's currently * ignored as well. */ - const int allowed_flags = O_APPEND | O_NONBLOCK | OLD_O_NDELAY; + const int allowed_flags = O_APPEND | O_NONBLOCK_MASK; int new_flags = (int) arg & allowed_flags; /* Carefully test for the O_NONBLOCK or deprecated OLD_O_NDELAY flag. Set only the flag that has been passed in. If both are set, just |