JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* syscalls.cc (nt_path_has_suffix): New function.

Browse Source 
(rename): Don't append .exe suffix if binary target name has any suffix
	at all.
This commit is contained in:
Corinna Vinschen
2009-11-05 14:44:12 +00:00
parent e807aacea9
commit ac4ad8bffc
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-11-05 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (nt_path_has_suffix): New function.
(rename): Don't append .exe suffix if binary target name has any suffix
at all.
2009-11-05 Corinna Vinschen <corinna@vinschen.de> 2009-11-05 Corinna Vinschen <corinna@vinschen.de>
* spawn.cc (dll_suffixes): Disable. Explain why. * spawn.cc (dll_suffixes): Disable. Explain why.

33
winsup/cygwin/syscalls.cc
View File

@@ -1643,6 +1643,30 @@ stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE trans)
return status; return status;
} }
/* This function tests if a filename has *any* suffix. In order to
make this quick and simple, we define a suffix as being not longer
than 4 chars, plus the leading dot. */
static inline bool
nt_path_has_suffix (PUNICODE_STRING upath)
{
USHORT pos = upath->Length / sizeof (WCHAR);
const PWCHAR path = upath->Buffer;
USHORT upto;
/* Too short for a native path? */
if (pos < 8)
return false;
upto = pos - 5;
while (--pos >= upto)
{
if (path[pos] == L'.')
return true;
if (path[pos] == L'\\')
break;
}
return false;
}
extern "C" int extern "C" int
rename (const char *oldpath, const char *newpath) rename (const char *oldpath, const char *newpath)
{ {
@@ -1841,9 +1865,8 @@ rename (const char *oldpath, const char *newpath)
&ro_u_lnk, TRUE)) &ro_u_lnk, TRUE))
rename_append_suffix (newpc, newpath, nlen, ".lnk"); rename_append_suffix (newpc, newpath, nlen, ".lnk");
else if (oldpc.is_binary () && !old_explicit_suffix else if (oldpc.is_binary () && !old_explicit_suffix
&& !RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (), && !nt_path_has_suffix (newpc.get_nt_native_path ()))
&ro_u_exe, TRUE)) /* To rename an executable foo.exe to bar-without-suffix, the
/* To rename an executable foo.exe to bar-without-exe-suffix, the
.exe suffix must be given explicitly in oldpath. */ .exe suffix must be given explicitly in oldpath. */
rename_append_suffix (newpc, newpath, nlen, ".exe"); rename_append_suffix (newpc, newpath, nlen, ".exe");
} }
@@ -1872,8 +1895,8 @@ rename (const char *oldpath, const char *newpath)
} }
else if (oldpc.is_binary ()) else if (oldpc.is_binary ())
{ {
if (!RtlEqualUnicodePathSuffix (newpc.get_nt_native_path (), /* Never append .exe suffix if file has any suffix already. */
&ro_u_exe, TRUE)) if (!nt_path_has_suffix (newpc.get_nt_native_path ()))
{ {
rename_append_suffix (new2pc, newpath, nlen, ".exe"); rename_append_suffix (new2pc, newpath, nlen, ".exe");
removepc = &newpc; removepc = &newpc;