summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/syscalls.cc5
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4527099c7..e319b44b4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11 Corinna Vinschen <corinna@vinschen.de>
+
+ * syscalls.cc (rename): If newpath doesn't exist, check if .exe suffix
+ in oldpath has been omitted before appending .exe to newpath.
+
2008-08-09 Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_dev_floppy::raw_read): Don't set
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 92446bcc0..7801ea2b3 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1656,10 +1656,11 @@ rename (const char *oldpath, const char *newpath)
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
L".lnk", TRUE))
rename_append_suffix (newpc, newpath, nlen, ".lnk");
- else if (oldpc.is_binary ()
+ else if (oldpc.is_binary () && !old_explicit_suffix
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (),
L".exe", TRUE))
- /* NOTE: No way to rename an executable foo.exe to foo. */
+ /* To rename an executable foo.exe to bar-without-exe-suffix, the
+ .exe suffix must be given explicitly in oldpath. */
rename_append_suffix (newpc, newpath, nlen, ".exe");
}
else if (newpc.isdir ())