https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3da81956e25daa2ec6ba18d27f3614efee828819
commit 3da81956e25daa2ec6ba18d27f3614efee828819 Author: Corinna Vinschen <[email protected]> Date: Wed Dec 9 18:11:47 2015 +0100 In FILE_ID_BOTH_DIR_INFORMATION it's actually FileId, not IndexNumber * ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId since it's actually right here. * fhandler_disk_file.cc: Accommodate above change. Signed-off-by: Corinna Vinschen <[email protected]> Diff: --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler_disk_file.cc | 4 ++-- winsup/cygwin/ntdll.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 16282e0..73e4795 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2015-12-09 Corinna Vinschen <[email protected]> + + * ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId + since it's actually right here. + * fhandler_disk_file.cc: Accommodate above change. + 2015-12-08 Corinna Vinschen <[email protected]> * thread.cc (pthread::setcancelstate): Remove unnecessary locking. diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 178cafa..0567a13 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -494,7 +494,7 @@ fhandler_base::fstat_by_name (struct stat *buf) debug_printf ("%y = NtQueryDirectoryFile(%S)", status, pc.get_nt_native_path ()); else - ino = fdi_buf.fdi.IndexNumber.QuadPart; + ino = fdi_buf.fdi.FileId.QuadPart; } } return fstat_helper (buf, 1); @@ -2339,7 +2339,7 @@ go_ahead: FileNameLength = buf->FileNameLength; FileAttributes = buf->FileAttributes; if ((dir->__flags & dirent_set_d_ino)) - de->d_ino = buf->IndexNumber.QuadPart; + de->d_ino = buf->FileId.QuadPart; } else if ((dir->__flags & dirent_nfs_d_ino)) { diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h index 7119c1a..5cc7c46 100644 --- a/winsup/cygwin/ntdll.h +++ b/winsup/cygwin/ntdll.h @@ -265,7 +265,7 @@ typedef struct _FILE_ID_BOTH_DIR_INFORMATION ULONG EaSize; CCHAR ShortNameLength; WCHAR ShortName[12]; - LARGE_INTEGER IndexNumber; + LARGE_INTEGER FileId; WCHAR FileName[1]; } FILE_ID_BOTH_DIR_INFORMATION, *PFILE_ID_BOTH_DIR_INFORMATION;
