diff options
| -rw-r--r-- | winsup/cygwin/fhandler_socket_local.cc | 9 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket_unix.cc | 11 |
2 files changed, 10 insertions, 10 deletions
diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler_socket_local.cc index 964f3e8..f8adf6c 100644 --- a/winsup/cygwin/fhandler_socket_local.cc +++ b/winsup/cygwin/fhandler_socket_local.cc @@ -673,11 +673,12 @@ fhandler_socket_local::fcntl (int cmd, intptr_t arg) int __reg2 fhandler_socket_local::fstat (struct stat *buf) { - int res; - - if (get_sun_path () && get_sun_path ()[0] == '\0') + if (!dev ().isfs ()) + /* fstat called on a socket. */ return fhandler_socket_wsock::fstat (buf); - res = fhandler_base::fstat_fs (buf); + + /* stat/lstat on a socket file or fstat on a socket opened w/ O_PATH. */ + int res = fhandler_base::fstat_fs (buf); if (!res) { buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; diff --git a/winsup/cygwin/fhandler_socket_unix.cc b/winsup/cygwin/fhandler_socket_unix.cc index eedb084..8091fa8 100644 --- a/winsup/cygwin/fhandler_socket_unix.cc +++ b/winsup/cygwin/fhandler_socket_unix.cc @@ -2337,13 +2337,12 @@ fhandler_socket_unix::fcntl (int cmd, intptr_t arg) int __reg2 fhandler_socket_unix::fstat (struct stat *buf) { - int ret = 0; - - if (sun_path () - && (sun_path ()->un_len <= (socklen_t) sizeof (sa_family_t) - || sun_path ()->un.sun_path[0] == '\0')) + if (!dev ().isfs ()) + /* fstat called on a socket. */ return fhandler_socket::fstat (buf); - ret = fhandler_base::fstat_fs (buf); + + /* stat/lstat on a socket file or fstat on a socket opened w/ O_PATH. */ + int ret = fhandler_base::fstat_fs (buf); if (!ret) { buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; |