* syscalls.cc (try_to_bin): Drop fh_dup, reuse tmp_fh instead.

This commit is contained in:
Corinna Vinschen 2013-11-27 14:30:36 +00:00
parent 854ed5f03a
commit 1aaa128794
2 changed files with 6 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2013-11-27 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (try_to_bin): Drop fh_dup, reuse tmp_fh instead.
2013-11-27 Corinna Vinschen <corinna@vinschen.de> 2013-11-27 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (try_to_bin): Take additional parameter to get file open * syscalls.cc (try_to_bin): Take additional parameter to get file open

View File

@ -280,17 +280,16 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
the recycler directory name, too. */ the recycler directory name, too. */
if (!pc.objcaseinsensitive ()) if (!pc.objcaseinsensitive ())
{ {
HANDLE fh_dup;
InitializeObjectAttributes (&attr, &ro_u_empty, OBJ_CASE_INSENSITIVE, InitializeObjectAttributes (&attr, &ro_u_empty, OBJ_CASE_INSENSITIVE,
fh, NULL); fh, NULL);
status = NtOpenFile (&fh_dup, access, &attr, &io, FILE_SHARE_VALID_FLAGS, status = NtOpenFile (&tmp_fh, access, &attr, &io, FILE_SHARE_VALID_FLAGS,
flags); flags);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
debug_printf ("NtOpenFile (reopen) failed, status = %y", status); debug_printf ("NtOpenFile (reopen) failed, status = %y", status);
else else
{ {
NtClose (fh); NtClose (fh);
fh = fh_dup; fh = tmp_fh;
} }
} }
/* Initialize recycler path. */ /* Initialize recycler path. */