diff options
| author | Ken Brown <kbrown@cornell.edu> | 2020-01-23 14:39:15 -0500 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2020-01-30 09:43:19 -0500 |
| commit | 3a2191653ac979f494aa2797942bd96414cedde8 (patch) | |
| tree | 12870d52775ebc63bb1ef6c7139b7f1fc0b99e11 | |
| parent | 9042d0ce65533a26fc3264206db5828d5692332c (diff) | |
| download | cygnal-3a2191653ac979f494aa2797942bd96414cedde8.tar.gz cygnal-3a2191653ac979f494aa2797942bd96414cedde8.tar.bz2 cygnal-3a2191653ac979f494aa2797942bd96414cedde8.zip | |
Cygwin: AF_LOCAL: allow opening with the O_PATH flag
If that flag is not set, or if an attempt is made to open a different
type of socket, the errno is now EOPNOTSUPP instead of ENXIO. This is
consistent with POSIX, starting with the 2016 edition. Earlier
editions were silent on this issue.
Opening is done in a (new) fhandler_socket_local::open method by
calling fhandler_base::open_fs.
Also add a corresponding fhandler_socket_local::close method.
| -rw-r--r-- | winsup/cygwin/fhandler.h | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket_local.cc | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 80a78d14c..c54780ef6 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -834,6 +834,8 @@ class fhandler_socket_local: public fhandler_socket_wsock int getsockopt (int level, int optname, const void *optval, __socklen_t *optlen); + int open (int flags, mode_t mode = 0); + int close (); int __reg2 fstat (struct stat *buf); int __reg2 fstatvfs (struct statvfs *buf); int __reg1 fchmod (mode_t newmode); diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler_socket_local.cc index f88ced22d..e7f4fe603 100644 --- a/winsup/cygwin/fhandler_socket_local.cc +++ b/winsup/cygwin/fhandler_socket_local.cc @@ -634,6 +634,26 @@ fhandler_socket_local::dup (fhandler_base *child, int flags) return fhandler_socket_wsock::dup (child, flags); } +int +fhandler_socket_local::open (int flags, mode_t mode) +{ + /* We don't support opening sockets unless O_PATH is specified. */ + if (flags & O_PATH) + return open_fs (flags, mode); + + set_errno (EOPNOTSUPP); + return 0; +} + +int +fhandler_socket_local::close () +{ + if (get_flags () & O_PATH) + return fhandler_base::close (); + else + return fhandler_socket_wsock::close (); +} + int __reg2 fhandler_socket_local::fstat (struct stat *buf) { |