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

* syscalls.cc (nt_path_has_executable_suffix): Change storage class of

Browse Source 
blessed_executable_suffixes to static.
	(rename): Revert meaning of old_explicit_suffix.  Change the rules
	for appending a .exe suffix and (yikes!) document them.
This commit is contained in:
Corinna Vinschen 2010-03-04 16:20:37 +00:00
parent a9fd742428
commit 8e75995c7f
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2010-03-04 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (nt_path_has_executable_suffix): Change storage class of
blessed_executable_suffixes to static.
(rename): Revert meaning of old_explicit_suffix. Change the rules
for appending a .exe suffix and (yikes!) document them.
2010-03-04 Charles Wilson <cygwin@cwilson.fastmail.fm> 2010-03-04 Charles Wilson <cygwin@cwilson.fastmail.fm>
* cygwin.din: Export __xdr functions. * cygwin.din: Export __xdr functions.

23
winsup/cygwin/syscalls.cc
View File

@ -1688,7 +1688,7 @@ stop_transaction (NTSTATUS status, HANDLE old_trans, HANDLE trans)
static inline bool static inline bool
nt_path_has_executable_suffix (PUNICODE_STRING upath) nt_path_has_executable_suffix (PUNICODE_STRING upath)
{ {
const PUNICODE_STRING blessed_executable_suffixes[] = static const PUNICODE_STRING blessed_executable_suffixes[] =
{ {
&ro_u_com, &ro_u_com,
&ro_u_dll, /* Messy, messy. Per MSDN, the GetBinaryType function is &ro_u_dll, /* Messy, messy. Per MSDN, the GetBinaryType function is
@ -1820,10 +1820,9 @@ rename (const char *oldpath, const char *newpath)
set_errno (ENOTDIR); set_errno (ENOTDIR);
goto out; goto out;
} }
if ((oldpc.known_suffix if (oldpc.known_suffix
&& (ascii_strcasematch (oldpath + olen - 4, ".lnk") && (ascii_strcasematch (oldpath + olen - 4, ".lnk")
|| ascii_strcasematch (oldpath + olen - 4, ".exe"))) || ascii_strcasematch (oldpath + olen - 4, ".exe")))
|| nt_path_has_executable_suffix (oldpc.get_nt_native_path ()))
old_explicit_suffix = true; old_explicit_suffix = true;
nlen = strlen (newpath); nlen = strlen (newpath);
@ -1931,9 +1930,14 @@ 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
&& oldpc.known_suffix
&& !nt_path_has_executable_suffix (newpc.get_nt_native_path ())) && !nt_path_has_executable_suffix (newpc.get_nt_native_path ()))
/* To rename an executable foo.exe to bar-without-suffix, the /* Never append .exe suffix if oldpath had .exe suffix given
.exe suffix must be given explicitly in oldpath. */ explicitely, or if oldpath wasn't already a .exe file, or
if the destination filename has one of the blessed executable
suffixes.
Note: To rename an executable foo.exe to bar-without-suffix,
the .exe suffix must be given explicitly in oldpath. */
rename_append_suffix (newpc, newpath, nlen, ".exe"); rename_append_suffix (newpc, newpath, nlen, ".exe");
} }
else else
@ -1961,8 +1965,13 @@ rename (const char *oldpath, const char *newpath)
} }
else if (oldpc.is_binary ()) else if (oldpc.is_binary ())
{ {
/* Never append .exe suffix if file has any suffix already. */ /* Never append .exe suffix if oldpath had .exe suffix given
if (!nt_path_has_executable_suffix (newpc.get_nt_native_path ())) explicitely, or if newfile is a binary (in which case the given
name probably makes sesne as it is), or if the destination
filename has one of the blessed executable suffixes. */
if (!old_explicit_suffix && oldpc.known_suffix
&& !newpc.is_binary ()
&& !nt_path_has_executable_suffix (newpc.get_nt_native_path ()))
{ {
rename_append_suffix (new2pc, newpath, nlen, ".exe"); rename_append_suffix (new2pc, newpath, nlen, ".exe");
removepc = &newpc; removepc = &newpc;