* fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks.

	* syscalls.cc (rename): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1d5523d..b93ff3e 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-02  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks.
+       * syscalls.cc (rename): Ditto.
+
 2007-08-02  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * 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 45dee51..0fa807d 100644 (file)
--- 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 03e0413..4d6f949 100644 (file)
--- 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);