diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-08-01 16:55:25 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-08-01 16:55:25 +0400 |
| commit | d3dd7d36822391acdc70aed2133dbda14cdb7fed (patch) | |
| tree | 3e13df736e85a898e3435b50bdc31577e119d4a6 /winsup/cygwin/path.h | |
| parent | 67629eb258e8c487c504dac7517ce787b2f338a9 (diff) | |
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Drop
usage of path_conv::volser().
(fhandler_base::fstat_by_name): Ditto.
* ntdll.h (STATUS_NO_MEDIA_IN_DEVICE): Define.
(STATUS_OBJECT_NAME_NOT_FOUND): Define.
(FILE_REMOVABLE_MEDIA, FILE_READ_ONLY_DEVICE, FILE_FLOPPY_DISKETTE)
(FILE_WRITE_ONCE_MEDIA, FILE_REMOTE_DEVICE, FILE_DEVICE_IS_MOUNTED)
(FILE_VIRTUAL_VOLUME, FILE_AUTOGENERATED_DEVICE_NAME)
FILE_DEVICE_SECURE_OPEN): Define Device Characteristics.
(struct _FILE_FS_DEVICE_INFORMATION): Define.
* path.cc (MAX_FS_INFO_CNT): Remove.
(fsinfo): Remove.
(fsinfo_cnt): Remove.
(fs_info::update): Rewrite using native NT functions. Drop fs_info
cashing since it's incorrect.
(path_conv::fillin): Use NtQueryInformationFile. Drop setting serial
number.
(path_conv::check): Accommodate new fs_info::update parameters.
(fillout_mntent): Ditto.
* path.h (fs_info): Drop serial, has_ea and drive_type status
flags.
(fs_info::update): Declare with new parameters.
(path_conf::drive_type): Remove.
(path_conf::fs_has_ea): Remove.
(path_conf::volser): Remove.
Diffstat (limited to 'winsup/cygwin/path.h')
| -rw-r--r-- | winsup/cygwin/path.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h index 390041813..41063e375 100644 --- a/winsup/cygwin/path.h +++ b/winsup/cygwin/path.h @@ -98,13 +98,10 @@ struct fs_info struct status_flags { DWORD flags; /* Volume flags */ - DWORD serial; /* Volume serial number */ unsigned is_remote_drive : 1; unsigned has_buggy_open : 1; - unsigned has_ea : 1; unsigned has_acls : 1; unsigned hasgood_inode : 1; - unsigned drive_type : 3; unsigned is_fat : 1; unsigned is_ntfs : 1; unsigned is_samba : 1; @@ -117,13 +114,11 @@ struct fs_info { name_hash = 0; root_len = 0; - flags () = serial () = 0; + flags () = 0; is_remote_drive (false); has_buggy_open (false); - has_ea (false); has_acls (false); hasgood_inode (false); - drive_type (false); is_fat (false); is_ntfs (false); is_samba (false); @@ -132,15 +127,12 @@ struct fs_info is_cdrom (false); } inline DWORD& flags () {return status.flags;}; - inline DWORD& serial () {return status.serial;}; inline int length () const {return root_len;} IMPLEMENT_STATUS_FLAG (bool, is_remote_drive) IMPLEMENT_STATUS_FLAG (bool, has_buggy_open) - IMPLEMENT_STATUS_FLAG (bool, has_ea) IMPLEMENT_STATUS_FLAG (bool, has_acls) IMPLEMENT_STATUS_FLAG (bool, hasgood_inode) - IMPLEMENT_STATUS_FLAG (DWORD, drive_type) IMPLEMENT_STATUS_FLAG (bool, is_fat) IMPLEMENT_STATUS_FLAG (bool, is_ntfs) IMPLEMENT_STATUS_FLAG (bool, is_samba) @@ -148,7 +140,7 @@ struct fs_info IMPLEMENT_STATUS_FLAG (bool, is_netapp) IMPLEMENT_STATUS_FLAG (bool, is_cdrom) - bool update (const char *); + bool update (PUNICODE_STRING, bool) __attribute__ ((regparm (3))); }; class path_conv @@ -284,9 +276,7 @@ class path_conv short get_unitn () const {return dev.minor;} DWORD file_attributes () const {return fileattr;} void file_attributes (DWORD new_attr) {fileattr = new_attr;} - DWORD drive_type () const {return fs.drive_type ();} DWORD fs_flags () {return fs.flags ();} - bool fs_has_ea () const {return fs.has_ea ();} bool fs_is_fat () const {return fs.is_fat ();} bool fs_is_ntfs () const {return fs.is_ntfs ();} bool fs_is_samba () const {return fs.is_samba ();} @@ -294,7 +284,6 @@ class path_conv bool fs_is_netapp () const {return fs.is_netapp ();} bool fs_is_cdrom () const {return fs.is_cdrom ();} void set_path (const char *p) {strcpy (path, p);} - DWORD volser () { return fs.serial (); } void fillin (HANDLE h); inline size_t size () { |