diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-08-02 15:13:56 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-08-02 15:13:56 +0000 |
| commit | e809fec984b4d7a7c972d4963fba03301b46be2b (patch) | |
| tree | 23d9572ebe54d0d11ab420ebac7f752954af334f | |
| parent | 64a62f4cfe52666c015d19c747978f67def4cea4 (diff) | |
| download | cygnal-e809fec984b4d7a7c972d4963fba03301b46be2b.tar.gz cygnal-e809fec984b4d7a7c972d4963fba03301b46be2b.tar.bz2 cygnal-e809fec984b4d7a7c972d4963fba03301b46be2b.zip | |
* fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks.
* syscalls.cc (rename): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1d5523d9a..b93ff3e4e 100644 --- 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 45dee518b..0fa807dd3 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 03e041348..4d6f94951 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); |