JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* globals.cc: Reorder constant UNICODE_STRINGs for clarity.

Browse Source 
* mount.h (fs_info::sttaus): Move filesystem type flags into
	substructure.  Add union to allow simple test for having set any
	one filesystem type flag.  Replace has_buggy_open flag with is_sunwnfs
	flag.  Replace has_buggy_fileid_dirinfo with is_unixfs flag.
	(fs_info::got_fs): New private method.
	(fs_info::has_buggy_open): New explicit implementation.
	(fs_info::has_buggy_fileid_dirinfo): Ditto.
	* mount.cc (fs_info::update): Optimize filesystem checks for speed.
	* winsup.h (IMPLEMENT_STATUS_FLAG): Change write accessor to return
	value just set.
This commit is contained in:
Corinna Vinschen 2009-07-16 09:56:25 +00:00
parent 5e5a843711
commit fc261e53f0
5 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,17 @@
2009-07-15 Corinna Vinschen <corinna@vinschen.de>
* globals.cc: Reorder constant UNICODE_STRINGs for clarity.
* mount.h (fs_info::sttaus): Move filesystem type flags into
substructure. Add union to allow simple test for having set any
one filesystem type flag. Replace has_buggy_open flag with is_sunwnfs
flag. Replace has_buggy_fileid_dirinfo with is_unixfs flag.
(fs_info::got_fs): New private method.
(fs_info::has_buggy_open): New explicit implementation.
(fs_info::has_buggy_fileid_dirinfo): Ditto.
* mount.cc (fs_info::update): Optimize filesystem checks for speed.
* winsup.h (IMPLEMENT_STATUS_FLAG): Change write accessor to return
value just set.
2009-07-15 Corinna Vinschen <corinna@vinschen.de> 2009-07-15 Corinna Vinschen <corinna@vinschen.de>
* fhandler_netdrive.cc (GET_RESOURCE_INFO): Remove. * fhandler_netdrive.cc (GET_RESOURCE_INFO): Remove.

17
winsup/cygwin/globals.cc
View File

@ -84,16 +84,17 @@ UNICODE_STRING _RDATA ro_u_exe = _ROU (L".exe");
UNICODE_STRING _RDATA ro_u_com = _ROU (L".com"); UNICODE_STRING _RDATA ro_u_com = _ROU (L".com");
UNICODE_STRING _RDATA ro_u_proc = _ROU (L"proc"); UNICODE_STRING _RDATA ro_u_proc = _ROU (L"proc");
UNICODE_STRING _RDATA ro_u_pmem = _ROU (L"\\device\\physicalmemory"); UNICODE_STRING _RDATA ro_u_pmem = _ROU (L"\\device\\physicalmemory");
UNICODE_STRING _RDATA ro_u_mtx = _ROU (L"mtx");
UNICODE_STRING _RDATA ro_u_fat = _ROU (L"FAT");
UNICODE_STRING _RDATA ro_u_csc = _ROU (L"CSC-CACHE");
UNICODE_STRING _RDATA ro_u_ntfs = _ROU (L"NTFS");
UNICODE_STRING _RDATA ro_u_nfs = _ROU (L"NFS");
UNICODE_STRING _RDATA ro_u_unixfs = _ROU (L"UNIXFS");
UNICODE_STRING _RDATA ro_u_sunwnfs = _ROU (L"SUNWNFS");
UNICODE_STRING _RDATA ro_u_udf = _ROU (L"UDF");
UNICODE_STRING _RDATA ro_u_natp = _ROU (L"\\??\\"); UNICODE_STRING _RDATA ro_u_natp = _ROU (L"\\??\\");
UNICODE_STRING _RDATA ro_u_uncp = _ROU (L"\\??\\UNC\\"); UNICODE_STRING _RDATA ro_u_uncp = _ROU (L"\\??\\UNC\\");
UNICODE_STRING _RDATA ro_u_mtx = _ROU (L"mtx");
UNICODE_STRING _RDATA ro_u_csc = _ROU (L"CSC-CACHE");
UNICODE_STRING _RDATA ro_u_fat = _ROU (L"FAT");
UNICODE_STRING _RDATA ro_u_mvfs = _ROU (L"MVFS");
UNICODE_STRING _RDATA ro_u_nfs = _ROU (L"NFS");
UNICODE_STRING _RDATA ro_u_ntfs = _ROU (L"NTFS");
UNICODE_STRING _RDATA ro_u_sunwnfs = _ROU (L"SUNWNFS");
UNICODE_STRING _RDATA ro_u_udf = _ROU (L"UDF");
UNICODE_STRING _RDATA ro_u_unixfs = _ROU (L"UNIXFS");
#undef _RDATA #undef _RDATA
#undef _ROU #undef _ROU

76
winsup/cygwin/mount.cc
View File

@ -171,12 +171,10 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
ffdi.DeviceType = ffdi.Characteristics = 0; ffdi.DeviceType = ffdi.Characteristics = 0;
if (ffdi.Characteristics & FILE_REMOTE_DEVICE if ((ffdi.Characteristics & FILE_REMOTE_DEVICE)
|| (!ffdi.DeviceType || (!ffdi.DeviceType
&& RtlEqualUnicodePathPrefix (attr.ObjectName, &ro_u_uncp, TRUE))) && RtlEqualUnicodePathPrefix (attr.ObjectName, &ro_u_uncp, TRUE)))
is_remote_drive (true); is_remote_drive (true);
else
is_remote_drive (false);
if (!no_media) if (!no_media)
status = NtQueryVolumeInformationFile (vol, &io, &ffai_buf.ffai, status = NtQueryVolumeInformationFile (vol, &io, &ffai_buf.ffai,
@ -217,8 +215,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
| FILE_NAMED_STREAMS) | FILE_NAMED_STREAMS)
RtlInitCountedUnicodeString (&fsname, ffai_buf.ffai.FileSystemName, RtlInitCountedUnicodeString (&fsname, ffai_buf.ffai.FileSystemName,
ffai_buf.ffai.FileSystemNameLength); ffai_buf.ffai.FileSystemNameLength);
is_fat (RtlEqualUnicodePathPrefix (&fsname, &ro_u_fat, TRUE));
is_csc_cache (RtlEqualUnicodeString (&fsname, &ro_u_csc, FALSE));
if (is_remote_drive ()) if (is_remote_drive ())
{ {
/* This always fails on NT4. */ /* This always fails on NT4. */
@ -234,40 +230,44 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
samba_version (extended_info->samba_version); samba_version (extended_info->samba_version);
} }
} }
if (!got_fs ()
/* Test for Samba on NT4 or for older Samba releases not supporting /* Test for Samba on NT4 or for older Samba releases not supporting
extended info. */ extended info. */
if (!is_samba ()) && !is_samba (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE)
is_samba (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE) && FS_IS_SAMBA)
&& FS_IS_SAMBA); /* Netapp inode info is unusable. */
&& !is_netapp (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE)
if (!is_samba ()) && FS_IS_NETAPP_DATAONTAP)
{ /* Microsoft NFS needs distinct access methods for metadata. */
is_netapp (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE) && !is_nfs (RtlEqualUnicodeString (&fsname, &ro_u_nfs, FALSE))
&& FS_IS_NETAPP_DATAONTAP); /* Known remote file system which can't handle calls to
is_nfs (RtlEqualUnicodeString (&fsname, &ro_u_nfs, FALSE));
if (!is_nfs ())
{
/* Known remote file systems which can't handle calls to
NtQueryDirectoryFile(FileIdBothDirectoryInformation) */ NtQueryDirectoryFile(FileIdBothDirectoryInformation) */
has_buggy_fileid_dirinfo (RtlEqualUnicodeString (&fsname, && !is_unixfs (RtlEqualUnicodeString (&fsname, &ro_u_unixfs, FALSE)))
&ro_u_unixfs, /* Known remote file system with buggy open calls. Further
FALSE));
/* Known remote file systems with buggy open calls. Further
explanation in fhandler.cc (fhandler_disk_file::open). */ explanation in fhandler.cc (fhandler_disk_file::open). */
has_buggy_open (RtlEqualUnicodeString (&fsname, &ro_u_sunwnfs, is_sunwnfs (RtlEqualUnicodeString (&fsname, &ro_u_sunwnfs, FALSE));
FALSE));
} }
if (!got_fs ()
&& !is_ntfs (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE))
&& !is_fat (RtlEqualUnicodePathPrefix (&fsname, &ro_u_fat, TRUE))
&& !is_csc_cache (RtlEqualUnicodeString (&fsname, &ro_u_csc, FALSE))
&& is_cdrom (ffdi.DeviceType == FILE_DEVICE_CD_ROM))
{
is_udf (RtlEqualUnicodeString (&fsname, &ro_u_udf, FALSE));
/* UDF on NT 5.x is broken (at least) in terms of case sensitivity.
The UDF driver reports the FILE_CASE_SENSITIVE_SEARCH capability
but:
- Opening the root directory for query seems to work at first,
but the filenames in the directory listing are mutilated.
- When trying to open a file or directory case sensitive, the file
appears to be non-existant. */
if (is_udf () && wincap.has_broken_udf ())
caseinsensitive (true);
} }
}
is_ntfs (RtlEqualUnicodeString (&fsname, &ro_u_ntfs, FALSE)
&& !is_samba () && !is_netapp ());
has_acls (flags () & FS_PERSISTENT_ACLS); has_acls (flags () & FS_PERSISTENT_ACLS);
hasgood_inode (((flags () & FILE_PERSISTENT_ACLS) && !is_netapp ()) /* Netapp inodes numbers are fly-by-night. */
|| is_nfs ()); hasgood_inode ((has_acls () && !is_netapp ()) || is_nfs ());
/* Case sensitivity is supported if FILE_CASE_SENSITIVE_SEARCH is set, /* Case sensitivity is supported if FILE_CASE_SENSITIVE_SEARCH is set,
except on Samba which handles Windows clients case insensitive. except on Samba which handles Windows clients case insensitive.
NFS doesn't set the FILE_CASE_SENSITIVE_SEARCH flag but is case NFS doesn't set the FILE_CASE_SENSITIVE_SEARCH flag but is case
@ -275,20 +275,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
caseinsensitive ((!(flags () & FILE_CASE_SENSITIVE_SEARCH) || is_samba ()) caseinsensitive ((!(flags () & FILE_CASE_SENSITIVE_SEARCH) || is_samba ())
&& !is_nfs ()); && !is_nfs ());
is_cdrom (ffdi.DeviceType == FILE_DEVICE_CD_ROM);
if (is_cdrom ())
{
is_udf (RtlEqualUnicodeString (&fsname, &ro_u_udf, FALSE));
/* UDF on NT 5.x is broken (at least) in terms of case sensitivity. The
UDF driver reports the FILE_CASE_SENSITIVE_SEARCH capability but:
- Opening the root directory for query seems to work at first, but the
filenames in the directory listing are mutilated.
- When trying to open a file or directory case sensitive, the file
appears to be non-existant. */
if (is_udf () && wincap.has_broken_udf ())
caseinsensitive (true);
}
if (!in_vol) if (!in_vol)
NtClose (vol); NtClose (vol);
return true; return true;

20
winsup/cygwin/mount.h
View File

@ -20,11 +20,13 @@ class fs_info
ULONG samba_version; /* Samba version if available */ ULONG samba_version; /* Samba version if available */
ULONG name_len; /* MaximumComponentNameLength */ ULONG name_len; /* MaximumComponentNameLength */
unsigned is_remote_drive : 1; unsigned is_remote_drive : 1;
unsigned has_buggy_open : 1;
unsigned has_buggy_fileid_dirinfo : 1;
unsigned has_acls : 1; unsigned has_acls : 1;
unsigned hasgood_inode : 1; unsigned hasgood_inode : 1;
unsigned caseinsensitive : 1; unsigned caseinsensitive : 1;
union
{
struct
{
unsigned is_fat : 1; unsigned is_fat : 1;
unsigned is_ntfs : 1; unsigned is_ntfs : 1;
unsigned is_samba : 1; unsigned is_samba : 1;
@ -33,8 +35,15 @@ class fs_info
unsigned is_cdrom : 1; unsigned is_cdrom : 1;
unsigned is_udf : 1; unsigned is_udf : 1;
unsigned is_csc_cache : 1; unsigned is_csc_cache : 1;
unsigned is_sunwnfs : 1;
unsigned is_unixfs : 1;
};
unsigned long fs_flags;
};
} status; } status;
ULONG sernum; ULONG sernum;
unsigned long got_fs () { return status.fs_flags; }
public: public:
void clear () { memset (&status, 0 , sizeof status); sernum = 0UL; } void clear () { memset (&status, 0 , sizeof status); sernum = 0UL; }
fs_info () { clear (); } fs_info () { clear (); }
@ -43,8 +52,6 @@ class fs_info
IMPLEMENT_STATUS_FLAG (ULONG, samba_version) IMPLEMENT_STATUS_FLAG (ULONG, samba_version)
IMPLEMENT_STATUS_FLAG (ULONG, name_len) IMPLEMENT_STATUS_FLAG (ULONG, name_len)
IMPLEMENT_STATUS_FLAG (bool, is_remote_drive) IMPLEMENT_STATUS_FLAG (bool, is_remote_drive)
IMPLEMENT_STATUS_FLAG (bool, has_buggy_open)
IMPLEMENT_STATUS_FLAG (bool, has_buggy_fileid_dirinfo)
IMPLEMENT_STATUS_FLAG (bool, has_acls) IMPLEMENT_STATUS_FLAG (bool, has_acls)
IMPLEMENT_STATUS_FLAG (bool, hasgood_inode) IMPLEMENT_STATUS_FLAG (bool, hasgood_inode)
IMPLEMENT_STATUS_FLAG (bool, caseinsensitive) IMPLEMENT_STATUS_FLAG (bool, caseinsensitive)
@ -56,8 +63,13 @@ class fs_info
IMPLEMENT_STATUS_FLAG (bool, is_cdrom) IMPLEMENT_STATUS_FLAG (bool, is_cdrom)
IMPLEMENT_STATUS_FLAG (bool, is_udf) IMPLEMENT_STATUS_FLAG (bool, is_udf)
IMPLEMENT_STATUS_FLAG (bool, is_csc_cache) IMPLEMENT_STATUS_FLAG (bool, is_csc_cache)
IMPLEMENT_STATUS_FLAG (bool, is_sunwnfs)
IMPLEMENT_STATUS_FLAG (bool, is_unixfs)
ULONG serial_number () const { return sernum; } ULONG serial_number () const { return sernum; }
int has_buggy_open () const {return is_sunwnfs ();}
int has_buggy_fileid_dirinfo () const {return is_unixfs ();}
bool update (PUNICODE_STRING, HANDLE) __attribute__ ((regparm (3))); bool update (PUNICODE_STRING, HANDLE) __attribute__ ((regparm (3)));
}; };

2
winsup/cygwin/winsup.h
View File

@ -124,7 +124,7 @@ extern int cygserver_running;
/* Used to define status flag accessor methods */ /* Used to define status flag accessor methods */
#define IMPLEMENT_STATUS_FLAG(type,flag) \ #define IMPLEMENT_STATUS_FLAG(type,flag) \
void flag (type val) { status.flag = (val); } \ type flag (type val) { return (type) (status.flag = (val)); } \
type flag () const { return (type) status.flag; } type flag () const { return (type) status.flag; }
/* Used when treating / and \ as equivalent. */ /* Used when treating / and \ as equivalent. */