From 6ca53189400aa2d4b12ccea4378f5b2ff759cf50 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 8 Mar 2006 16:10:55 +0000 Subject: * syscalls.cc (statvfs): Simplify path name expression. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/syscalls.cc | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a817b2d..93fd839 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2006-03-08 Corinna Vinschen + * syscalls.cc (statvfs): Simplify path name expression. + +2006-03-08 Corinna Vinschen + * syscalls.cc: Include winioctl.h. (statvfs): Request correct volume size using DeviceIoControl if quotas are enforced on the file system. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 0538ffa..ef3f90f 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1845,19 +1845,19 @@ statvfs (const char *fname, struct statvfs *sfs) if (freec > availc) { /* Quotas active. We can't trust totalc. */ - HANDLE hdl = CreateFile (full_path.get_win32 (), READ_CONTROL, + HANDLE hdl = CreateFile (full_path, READ_CONTROL, wincap.shared (), &sec_none_nih, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); if (hdl == INVALID_HANDLE_VALUE) - debug_printf ("CreateFile (%s) failed, %E", full_path.get_win32 ()); + debug_printf ("CreateFile (%s) failed, %E", full_path); else { NTFS_VOLUME_DATA_BUFFER nvdb; DWORD bytes; if (!DeviceIoControl (hdl, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &nvdb, sizeof nvdb, &bytes, NULL)) - debug_printf ("DeviceIoControl (%s) failed, %E", full_path.get_win32 ()); + debug_printf ("DeviceIoControl (%s) failed, %E", full_path); else totalc = nvdb.TotalClusters.QuadPart; CloseHandle (hdl); -- cgit v1.1