https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8a953be5ef761d4c5cc0572eab3da2cb34b0474b
commit 8a953be5ef761d4c5cc0572eab3da2cb34b0474b Author: Corinna Vinschen <[email protected]> AuthorDate: Sat Sep 9 23:10:43 2023 +0200 Commit: Corinna Vinschen <[email protected]> CommitDate: Sat Sep 9 23:28:55 2023 +0200 Cygwin: NFS: fetch actual DOS attributes MSFT NFSv3 fakes DOS attributes based on file type and permissions. Rather than just faking FILE_ATTRIBUTE_DIRECTORY for dirs, fetch the "real" DOS attributes returned by NFS. This allows to handle the "R/O" attribute on shortcut files and thus reading and creating device shortcut files on NFS. Signed-off-by: Corinna Vinschen <[email protected]> Diff: --- winsup/cygwin/local_includes/path.h | 10 ++++++++-- winsup/cygwin/path.cc | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/local_includes/path.h b/winsup/cygwin/local_includes/path.h index 74f831e53fbe..c7f113f8746a 100644 --- a/winsup/cygwin/local_includes/path.h +++ b/winsup/cygwin/local_includes/path.h @@ -125,10 +125,16 @@ public: return nfs ? nfsattr ()->fileid : fai ()->InternalInformation.IndexNumber.QuadPart; } - inline DWORD get_dosattr (bool nfs) const + inline DWORD get_dosattr (HANDLE h, bool nfs) const { if (nfs) - return (nfsattr ()->type & 7) == NF3DIR ? FILE_ATTRIBUTE_DIRECTORY : 0; + { + IO_STATUS_BLOCK io; + FILE_BASIC_INFORMATION fbi; + + NtQueryInformationFile (h, &io, &fbi, sizeof fbi, FileBasicInformation); + return fbi.FileAttributes; + } return fai ()->BasicInformation.FileAttributes; } }; diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index c631fa8869b9..6cf6e02ca88b 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -3259,7 +3259,7 @@ restart: { status = conv_hdl.get_finfo (h, fs.is_nfs ()); if (NT_SUCCESS (status)) - fileattr = conv_hdl.get_dosattr (fs.is_nfs ()); + fileattr = conv_hdl.get_dosattr (h, fs.is_nfs ()); } if (!NT_SUCCESS (status)) {
