From e3145630252e1de617ed949974426c50a2f6ba0b Mon Sep 17 00:00:00 2001 From: corinna Date: Thu, 2 Aug 2007 15:13:54 +0000 Subject: [PATCH] * fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks. * syscalls.cc (rename): Ditto. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_disk_file.cc | 4 +++- winsup/cygwin/syscalls.cc | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1d5523d9af..b93ff3e4e1 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2007-08-02 Corinna Vinschen + + * fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks. + * syscalls.cc (rename): Ditto. + 2007-08-02 Christopher Faylor * lib/Makefile: Add missed file to accommodate below changes. diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 45dee518bc..0fa807dd33 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1717,7 +1717,9 @@ readdir_get_ino (const char *path, bool dot_dot) else if (NT_SUCCESS (NtOpenFile (&hdl, READ_CONTROL, pc.get_object_attr (attr, sec_none_nih), &io, FILE_SHARE_VALID_FLAGS, - FILE_OPEN_FOR_BACKUP_INTENT))) + FILE_OPEN_FOR_BACKUP_INTENT + | (pc.is_rep_symlink () + ? FILE_OPEN_REPARSE_POINT : 0)))) { ino = readdir_get_ino_by_handle (hdl); NtClose (hdl); diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 03e0413481..4d6f94951e 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1516,7 +1516,9 @@ rename (const char *oldpath, const char *newpath) /* DELETE is required to rename a file. */ status = NtOpenFile (&fh, DELETE, oldpc.get_object_attr (attr, sec_none_nih), - &io, FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT); + &io, FILE_SHARE_VALID_FLAGS, + FILE_OPEN_FOR_BACKUP_INTENT + | (oldpc.is_rep_symlink () ? FILE_OPEN_REPARSE_POINT : 0)); if (!NT_SUCCESS (status)) { __seterrno_from_nt_status (status); @@ -1535,7 +1537,10 @@ rename (const char *oldpath, const char *newpath) && ofsi.NumberOfLinks > 1 && NT_SUCCESS (NtOpenFile (&nfh, READ_CONTROL, (removepc ?: dstpc)->get_object_attr (attr, sec_none_nih), - &io, FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT))) + &io, FILE_SHARE_VALID_FLAGS, + FILE_OPEN_FOR_BACKUP_INTENT + | ((removepc ?: dstpc)->is_rep_symlink () + ? FILE_OPEN_REPARSE_POINT : 0)))) { static const size_t vsiz = sizeof (FILE_FS_VOLUME_INFORMATION) + 32 * sizeof (WCHAR); -- 2.11.0