This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Cygwin: AF_LOCAL::fstatvfs: use our handle if O_PATH is set
- From: Ken Brown <kbrown at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 30 Jan 2020 14:44:40 -0000
- Subject: [newlib-cygwin] Cygwin: AF_LOCAL::fstatvfs: use our handle if O_PATH is set
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=23cb58af623c457639fdcf97c1990edda0508d5c
commit 23cb58af623c457639fdcf97c1990edda0508d5c
Author: Ken Brown <kbrown@cornell.edu>
Date: Sat Jan 25 07:45:10 2020 -0500
Cygwin: AF_LOCAL::fstatvfs: use our handle if O_PATH is set
If O_PATH is set, then the fhandler_socket_local object has a handle
that can be used for getting the statvfs information. Use it by
calling fhandler_base::fstatvfs_by_handle. Without this change,
fhandler_disk_file::fstatfvs would be called on a new fhandler_disk
object, which would then have to be opened.
Diff:
---
winsup/cygwin/fhandler_socket_local.cc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler_socket_local.cc
index e7f4fe6..76815a6 100644
--- a/winsup/cygwin/fhandler_socket_local.cc
+++ b/winsup/cygwin/fhandler_socket_local.cc
@@ -675,6 +675,13 @@ fhandler_socket_local::fstatvfs (struct statvfs *sfs)
{
if (get_sun_path () && get_sun_path ()[0] == '\0')
return fhandler_socket_wsock::fstatvfs (sfs);
+ if (get_flags () & O_PATH)
+ /* We already have a handle. */
+ {
+ HANDLE h = get_handle ();
+ if (h)
+ return fstatvfs_by_handle (h, sfs);
+ }
fhandler_disk_file fh (pc);
fh.get_device () = FH_FS;
return fh.fstatvfs (sfs);