From 56551a9bfbb369e29b12d1b60dc810cd5a3356b9 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 10 Apr 2004 13:45:10 +0000 Subject: * Use new unified status_flag accessor methods from classes fhandler_*, tty_min, mtinfo and fs_info thoroughout. * fhandler.h: Redefine all set_close_on_exec methods to take a bool argument. (enum conn_state): Rename from connect_state. (class fhandler_base): Rename some status flags to align with accessor method names. Drop encoded flag entirely. Unify status accessor methods. Const'ify all read accessor methods. (class fhandler_socket): Ditto. (class fhandler_dev_raw): Ditto. * fhandler_disk_file.cc (fhandler_base::fstat_fs): Use fs.fs_is_fat() instead of evaluating FATness of file system here. (fhandler_disk_file::opendir): Drop call to set_encoded(). (fhandler_disk_file::readdir): Use pc.isencoded() directly. * mtinfo.h (class mtinfo_drive): Const'ify all read accessor methods. * path.cc (fsinfo_cnt): Add. (fs_info::update): Accomodate class changes. Evaluate file system name specific flags right here. Add thread safety for reading and writing global fsinfo array. * path.h (enum path_types): Drop values for flags kept in fs already. (struct fs_info): Move status informatin into private struct type status_flags. Add accessor methods. Remove path and file system name string arrays in favor of status bits. (class path_conv): Use new fs_info status information where appropriate. (path_conf::fs_has_ea): Rename from fs_fast_ea. (path_conf::fs_has_acls): New method. (path_conf::root_dir): Remove. (path_conf::volname): Remove. * syscalls (statfs): Evaluate root dir locally. * tty.h (class tty_min): Unify status accessor methods. Const'ify all read accessor methods. --- winsup/cygwin/net.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'winsup/cygwin/net.cc') diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 0d2608d77..3de2c0adc 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -636,7 +636,7 @@ fdsock (cygheap_fdmanip& fd, const device *dev, SOCKET soc) return false; fd->set_io_handle ((HANDLE) soc); fd->set_flags (O_RDWR | O_BINARY); - fd->set_r_no_interrupt (winsock2_active); + fd->uninterruptible_io (winsock2_active); cygheap->fdtab.inc_need_fixup_before (); debug_printf ("fd %d, name '%s', soc %p", (int) fd, dev->name, soc); return true; @@ -1960,7 +1960,7 @@ cygwin_rcmd (char **ahost, unsigned short inport, char *locuser, if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res)) { - ((fhandler_socket *) res_fd)->set_connect_state (connected); + ((fhandler_socket *) res_fd)->connect_state (connected); res = res_fd; } else @@ -1977,7 +1977,7 @@ cygwin_rcmd (char **ahost, unsigned short inport, char *locuser, if (newfd >= 0 && fdsock (newfd, tcp_dev, fd2s)) { *fd2p = newfd; - ((fhandler_socket *) fd2p)->set_connect_state (connected); + ((fhandler_socket *) fd2p)->connect_state (connected); } else { @@ -2040,7 +2040,7 @@ cygwin_rexec (char **ahost, unsigned short inport, char *locuser, if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res)) { - ((fhandler_socket *) res_fd)->set_connect_state (connected); + ((fhandler_socket *) res_fd)->connect_state (connected); res = res_fd; } else @@ -2056,7 +2056,7 @@ cygwin_rexec (char **ahost, unsigned short inport, char *locuser, if (newfd >= 0 && fdsock (newfd, tcp_dev, fd2s)) { - ((fhandler_socket *) fd2p)->set_connect_state (connected); + ((fhandler_socket *) fd2p)->connect_state (connected); *fd2p = newfd; } else @@ -2230,7 +2230,7 @@ socketpair (int family, int type, int protocol, int *sb) ((fhandler_socket *) sb0)->set_sun_path (""); ((fhandler_socket *) sb0)->set_addr_family (family); ((fhandler_socket *) sb0)->set_socket_type (type); - ((fhandler_socket *) sb0)->set_connect_state (connected); + ((fhandler_socket *) sb0)->connect_state (connected); cygheap_fdnew sb1 (sb0, false); @@ -2239,7 +2239,7 @@ socketpair (int family, int type, int protocol, int *sb) ((fhandler_socket *) sb1)->set_sun_path (""); ((fhandler_socket *) sb1)->set_addr_family (family); ((fhandler_socket *) sb1)->set_socket_type (type); - ((fhandler_socket *) sb1)->set_connect_state (connected); + ((fhandler_socket *) sb1)->connect_state (connected); sb[0] = sb0; sb[1] = sb1; -- cgit v1.2.3