* syscalls.cc (rename): Use unchanged path_conv in condition.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c9e7b2f..4cd396e 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-01  Corinna Vinschen  <corinna@vinschen.de>
 
+       * syscalls.cc (rename): Use unchanged path_conv in condition.
+
+2007-08-01  Corinna Vinschen  <corinna@vinschen.de>
+
        * smallprint.cc (__small_vsprintf): Add format specifier 'W' for
        PWCHAR arguments.  Move wide char handling after char handling.
 

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 6a3920a..6e1f781 100644 (file)
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1478,13 +1478,13 @@ rename (const char *oldpath, const char *newpath)
            {
              new2pc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
              newpc.get_nt_native_path ()->Length -= 4 * sizeof (WCHAR);
-             if (newpc.is_binary () || newpc.is_lnk_symlink ())
+             if (new2pc.is_binary () || new2pc.is_lnk_symlink ())
                removepc = &new2pc;
            }
        }
     }
   dstpc = (removepc == &newpc) ? &new2pc : &newpc;
-  
+
   /* 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);