diff options
| author | Ken Brown <kbrown@cornell.edu> | 2020-01-24 16:02:57 -0500 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2020-01-28 14:05:13 -0500 |
| commit | 68b7a457f7331ed852380cd7afd0e17dffdc726e (patch) | |
| tree | 1b4331ce302a276e3f5589c83d2af6f93a2f4c90 | |
| parent | 74e6e881433c45e758582adfdcb4be20ad5b52a9 (diff) | |
| download | cygnal-68b7a457f7331ed852380cd7afd0e17dffdc726e.tar.gz cygnal-68b7a457f7331ed852380cd7afd0e17dffdc726e.tar.bz2 cygnal-68b7a457f7331ed852380cd7afd0e17dffdc726e.zip | |
Cygwin: fhandler_disk_file::fstatvfs: refactor
Define a new method fhandler_base::fstatvfs_by_handle, extracted from
fhandler_disk_file::fstatvfs, which gets the statvfs information when
a handle is available.
This will be used in future commits for special files that have been
opened with O_PATH.
| -rw-r--r-- | winsup/cygwin/fhandler.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 22 |
2 files changed, 17 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 5d0c579f8..80a78d14c 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -392,6 +392,7 @@ private: int __reg2 fstat_by_name (struct stat *buf); public: virtual int __reg2 fstatvfs (struct statvfs *buf); + int __reg2 fstatvfs_by_handle (HANDLE h, struct statvfs *buf); int __reg2 utimens_fs (const struct timespec *); virtual int __reg1 fchmod (mode_t mode); virtual int __reg2 fchown (uid_t uid, gid_t gid); diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index d9213d741..19a1c5ac1 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -600,9 +600,7 @@ int __reg2 fhandler_disk_file::fstatvfs (struct statvfs *sfs) { int ret = -1, opened = 0; - NTSTATUS status; IO_STATUS_BLOCK io; - FILE_FS_FULL_SIZE_INFORMATION full_fsi; /* We must not use the stat handle here, even if it exists. The handle has been opened with FILE_OPEN_REPARSE_POINT, thus, in case of a volume mount point, it points to the FS of the mount point, rather than to the @@ -630,6 +628,22 @@ fhandler_disk_file::fstatvfs (struct statvfs *sfs) } } + ret = fstatvfs_by_handle (fh, sfs); +out: + if (opened) + NtClose (fh); + syscall_printf ("%d = fstatvfs(%s, %p)", ret, get_name (), sfs); + return ret; +} + +int __reg2 +fhandler_base::fstatvfs_by_handle (HANDLE fh, struct statvfs *sfs) +{ + int ret = -1; + NTSTATUS status; + IO_STATUS_BLOCK io; + FILE_FS_FULL_SIZE_INFORMATION full_fsi; + sfs->f_files = ULONG_MAX; sfs->f_ffree = ULONG_MAX; sfs->f_favail = ULONG_MAX; @@ -688,10 +702,6 @@ fhandler_disk_file::fstatvfs (struct statvfs *sfs) debug_printf ("%y = NtQueryVolumeInformationFile" "(%S, FileFsFullSizeInformation)", status, pc.get_nt_native_path ()); -out: - if (opened) - NtClose (fh); - syscall_printf ("%d = fstatvfs(%s, %p)", ret, get_name (), sfs); return ret; } |