* ntdll.h (RtlEqualUnicodePathPrefix): Rename from RtlEqualPathPrefix.

	(RtlEqualUnicodePathSuffix): Rename from RtlEqualPathSuffix.
	* fhandler_disk_file.cc (fhandler_disk_file::link): Accommodate above
	change.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c54330c..6f8e623 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,4 +1,11 @@
-2007-07-27  Corinna Vinschen  <corinna@vinschen.de>
+2007-07-28  Corinna Vinschen  <corinna@vinschen.de>
+
+       * ntdll.h (RtlEqualUnicodePathPrefix): Rename from RtlEqualPathPrefix.
+       (RtlEqualUnicodePathSuffix): Rename from RtlEqualPathSuffix.
+       * fhandler_disk_file.cc (fhandler_disk_file::link): Accommodate above
+       change.
+
+2007-07-28  Corinna Vinschen  <corinna@vinschen.de>
 
        * ntdll.h (RtlInitCountedUnicodeString): Swap order of string and length
        parameters to be the same as for RtlInitEmptyUnicodeString.

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index ef46bee..680d7bd 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1051,9 +1051,10 @@ fhandler_disk_file::link (const char *newpath)
          newpc.check (newpath, PC_SYM_NOFOLLOW);
        }
       else if (!pc.isdir ()
-              && RtlEqualPathSuffix (pc.get_nt_native_path (), L".exe", TRUE)
-              && !RtlEqualPathSuffix (newpc.get_nt_native_path (), L".exe",
-                                      TRUE))
+              && RtlEqualUnicodePathSuffix (pc.get_nt_native_path (),
+                                            L".exe", TRUE)
+              && !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
+                                             L".exe", TRUE))
        {
          /* Executable hack. */
          stpcpy (stpcpy (new_buf, newpath), ".exe");
@@ -1066,8 +1067,7 @@ fhandler_disk_file::link (const char *newpath)
   NTSTATUS status;
   OBJECT_ATTRIBUTES attr;
   IO_STATUS_BLOCK io;
-  status = NtOpenFile (&fh, 0,
-                      pc.get_object_attr (attr, sec_none_nih), &io,
+  status = NtOpenFile (&fh, 0, pc.get_object_attr (attr, sec_none_nih), &io,
                       FILE_SHARE_VALID_FLAGS,
                       FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT);
   if (!NT_SUCCESS (status))

diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index c30aed1..00863a7 100644 (file)
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -828,8 +828,8 @@ extern "C"
                                   path->Length - len * sizeof (WCHAR));
   }
   inline
-  BOOLEAN NTAPI RtlEqualPathPrefix (PUNICODE_STRING path, PCWSTR prefix,
-                                   BOOLEAN caseinsensitive)
+  BOOLEAN NTAPI RtlEqualUnicodePathPrefix (PUNICODE_STRING path, PCWSTR prefix,
+                                          BOOLEAN caseinsensitive)
   {
     UNICODE_STRING p, pref;
 
@@ -840,8 +840,8 @@ extern "C"
     return RtlEqualUnicodeString (&p, &pref, caseinsensitive);
   }
   inline
-  BOOL NTAPI RtlEqualPathSuffix (PUNICODE_STRING path, PCWSTR suffix,
-                                BOOLEAN caseinsensitive)
+  BOOL NTAPI RtlEqualUnicodePathSuffix (PUNICODE_STRING path, PCWSTR suffix,
+                                       BOOLEAN caseinsensitive)
   {
     UNICODE_STRING p, suf;