diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-07-28 20:08:45 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-07-28 20:08:45 +0400 |
| commit | 81e98baf8142a92dc0749b0f201a2d9b8cdb270c (patch) | |
| tree | d478ef0f8d474e2c53332b1415b52008eb275c13 | |
| parent | 74c5e8c73ace5043a1a78b479d7b701be3f5966d (diff) | |
* ntdll.h (RtlEqualUnicodePathPrefix): Rename from RtlEqualPathPrefix.
(RtlEqualUnicodePathSuffix): Rename from RtlEqualPathSuffix.
* fhandler_disk_file.cc (fhandler_disk_file::link): Accommodate above
change.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 10 | ||||
| -rw-r--r-- | winsup/cygwin/ntdll.h | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index c54330ca2..6f8e623b9 100644 --- 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 ef46beeaf..680d7bd04 100644 --- 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 c30aed15c..00863a78a 100644 --- 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; |