* syscalls.cc (rename): Close oldpath file handle immediately after

	trying to rename it.  Use nfh handle when checking for non-empty
	newpath directory.  Only change status if check_dir_not_empty really
	returns STATUS_DIRECTORY_NOT_EMPTY.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b93ff3e4e1f975cef73d127fcaca0bc8ac45dae2..5fca04dea915666a9ba141c0074e957a218028ad 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-09  Corinna Vinschen  <corinna@vinschen.de>
+
+       * syscalls.cc (rename): Close oldpath file handle immediately after
+       trying to rename it.  Use nfh handle when checking for non-empty
+       newpath directory.  Only change status if check_dir_not_empty really
+       returns STATUS_DIRECTORY_NOT_EMPTY.
+
 2007-08-02  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_disk_file.cc (readdir_get_ino): Accommodate native symlinks.

diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 0eca362757c5b7aba39f2008670bf82a0bdc90de..1475dd68e7150fa31db45ba2edad29f034136718 100644 (file)
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -806,6 +806,7 @@ extern "C"
                                               BOOLEAN);
   LONG NTAPI RtlCompareUnicodeString (PUNICODE_STRING, PUNICODE_STRING,
                                      BOOLEAN);
+  NTSTATUS NTAPI RtlConvertSidToUnicodeString (PUNICODE_STRING, PSID, BOOLEAN);
   VOID NTAPI RtlCopyUnicodeString (PUNICODE_STRING, PUNICODE_STRING);
   ULONG WINAPI RtlCreateUnicodeStringFromAsciiz (PUNICODE_STRING, PCSTR);
   BOOLEAN NTAPI RtlEqualUnicodeString (PUNICODE_STRING, PUNICODE_STRING,
@@ -815,6 +816,7 @@ extern "C"
   VOID NTAPI RtlFreeUnicodeString (PUNICODE_STRING);
   VOID NTAPI RtlInitEmptyUnicodeString (PUNICODE_STRING, PCWSTR, USHORT);
   VOID NTAPI RtlInitUnicodeString (PUNICODE_STRING, PCWSTR);
+  NTSTATUS NTAPI RtlIntegerToUnicodeString (ULONG, ULONG, PUNICODE_STRING);
   ULONG NTAPI RtlIsDosDeviceName_U (PCWSTR);
   ULONG NTAPI RtlNtStatusToDosError (NTSTATUS);
   NTSTATUS NTAPI RtlOemStringToUnicodeString (PUNICODE_STRING, POEM_STRING,

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 4d6f94951e9d0f912b216100fd0e9a02d92c02b4..3db5daeeec60cd03314c2fd74e591c58b09219fc 100644 (file)
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1577,6 +1577,7 @@ rename (const char *oldpath, const char *newpath)
   memcpy (&pfri->FileName,  dstpc->get_nt_native_path ()->Buffer,
          pfri->FileNameLength);
   status = NtSetInformationFile (fh, &io, pfri, size, FileRenameInformation);
+  NtClose (fh);
   if (NT_SUCCESS (status))
     {
       if (removepc)
@@ -1589,18 +1590,18 @@ rename (const char *oldpath, const char *newpath)
          whether we tried to rename to an existing non-empty dir.
         In this case we have to set errno to EEXIST. */
       if (status == STATUS_ACCESS_DENIED && dstpc->isdir ()
-         && NT_SUCCESS (NtOpenFile (&fh, FILE_LIST_DIRECTORY | SYNCHRONIZE,
+         && NT_SUCCESS (NtOpenFile (&nfh, FILE_LIST_DIRECTORY | SYNCHRONIZE,
                                    dstpc->get_object_attr (attr, sec_none_nih),
                                    &io, FILE_SHARE_VALID_FLAGS,
                                    FILE_OPEN_FOR_BACKUP_INTENT
                                    | FILE_SYNCHRONOUS_IO_NONALERT)))
        {
-         status = check_dir_not_empty (fh);
-         NtClose (fh);
+         if (check_dir_not_empty (nfh) == STATUS_DIRECTORY_NOT_EMPTY)
+           status = STATUS_DIRECTORY_NOT_EMPTY;
+         NtClose (nfh);
        }
       __seterrno_from_nt_status (status);
     }
-  NtClose (fh);
 
 out:
   syscall_printf ("%d = rename (%s, %s)", res, oldpath, newpath);